diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2007-02-06 01:48:28 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 04:03:23 +0100 |
| commit | a2c70211fa072f4076f0e59f909b69105f69072e (patch) | |
| tree | 7e676b3bdb44a2e30a9891b7dd19923c1624f47c /include | |
| parent | [POWERPC] Maple: use mmio nvram (diff) | |
| download | linux-a2c70211fa072f4076f0e59f909b69105f69072e.tar.xz linux-a2c70211fa072f4076f0e59f909b69105f69072e.zip | |
[POWERPC] Compile fixes for arch/powerpc dcr code
The new dcr code does not currently compile when configured for native
DCR access on ARCH=powerpc. This patch fixes the problems.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/dcr.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/ibm4xx.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/reg_booke.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/dcr.h b/include/asm-powerpc/dcr.h index b66c5e6941f0..9338d50538f1 100644 --- a/include/asm-powerpc/dcr.h +++ b/include/asm-powerpc/dcr.h @@ -33,6 +33,7 @@ * base from the device-tree */ #ifdef CONFIG_PPC_MERGE +struct device_node; extern unsigned int dcr_resource_start(struct device_node *np, unsigned int index); extern unsigned int dcr_resource_len(struct device_node *np, diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 499c14691c71..7a64ede53bb6 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h @@ -15,6 +15,7 @@ #define __ASM_IBM4XX_H__ #include <asm/types.h> +#include <asm/dcr.h> #ifdef CONFIG_40x diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h index a263fc1e65c4..82948ed2744a 100644 --- a/include/asm-ppc/reg_booke.h +++ b/include/asm-ppc/reg_booke.h @@ -9,8 +9,6 @@ #ifndef __ASM_PPC_REG_BOOKE_H__ #define __ASM_PPC_REG_BOOKE_H__ -#include <asm/dcr.h> - #ifndef __ASSEMBLY__ /* Performance Monitor Registers */ #define mfpmr(rn) ({unsigned int rval; \ |