diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-02-06 11:48:28 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 14:03:23 +1100 |
commit | a2c70211fa072f4076f0e59f909b69105f69072e (patch) | |
tree | 7e676b3bdb44a2e30a9891b7dd19923c1624f47c | |
parent | 4297c9869b3452860f1a2c588d43f9e62c701019 (diff) | |
download | kernel_goldelico_gta04-a2c70211fa072f4076f0e59f909b69105f69072e.zip kernel_goldelico_gta04-a2c70211fa072f4076f0e59f909b69105f69072e.tar.gz kernel_goldelico_gta04-a2c70211fa072f4076f0e59f909b69105f69072e.tar.bz2 |
[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>
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 1 | ||||
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 1 | ||||
-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 |
5 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 95776b6..ecee596 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -44,6 +44,7 @@ #include <asm/btext.h> #include <asm/div64.h> #include <asm/signal.h> +#include <asm/dcr.h> #ifdef CONFIG_8xx #include <asm/commproc.h> diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index c8b65ca..1f49503 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c @@ -43,6 +43,7 @@ #include <asm/div64.h> #include <asm/xmon.h> #include <asm/signal.h> +#include <asm/dcr.h> #ifdef CONFIG_8xx #include <asm/commproc.h> diff --git a/include/asm-powerpc/dcr.h b/include/asm-powerpc/dcr.h index b66c5e6..9338d50 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 499c146..7a64ede 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 a263fc1e..82948ed 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; \ |