[POWERPC] Compile fixes for arch/powerpc dcr code
authorDavid Gibson <david@gibson.dropbear.id.au>
Tue, 6 Feb 2007 00:48:28 +0000 (11:48 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 7 Feb 2007 03:03:23 +0000 (14:03 +1100)
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>
arch/powerpc/kernel/ppc_ksyms.c
arch/ppc/kernel/ppc_ksyms.c
include/asm-powerpc/dcr.h
include/asm-ppc/ibm4xx.h
include/asm-ppc/reg_booke.h

index 95776b6af4e2892513a70d118a73e70b39d278f9..ecee596d28f6e73d222883564592517b5a94a16c 100644 (file)
@@ -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>
index c8b65ca8a350e8c5ecc8c5acc90c4f0b845ecbc1..1f49503317cb424789a78bdbcd5668ec9dbbc10e 100644 (file)
@@ -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>
index b66c5e6941f01cabfc128a7b0f4082ac71555fae..9338d50538f1bddf6d904e4e5e8023eea835fdc8 100644 (file)
@@ -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,
index 499c14691c71dfe7ca8a9c043def011438d099af..7a64ede53bb6fd7ec5efde9852b7619b2d96e96a 100644 (file)
@@ -15,6 +15,7 @@
 #define __ASM_IBM4XX_H__
 
 #include <asm/types.h>
+#include <asm/dcr.h>
 
 #ifdef CONFIG_40x
 
index a263fc1e65c41c6990cfc3f0a3ff93629c557778..82948ed2744a78f7f29e2b4423bed318b71c72af 100644 (file)
@@ -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; \