[PATCH] ppc32: Fix pmac compile after OCP changes

From: Paul Mackerras <paulus@samba.org>

Matt Porter's recent changes broke the compile for non-4xx ppc32 systems,
unfortunately.  I get an error that mfdcr is not defined in
include/asm-ppc/ocp.h when compiling for powermac (reasonable, since the
mfdcr instruction only exists on 4xx processors).  The patch below fixes
it.

diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 30ec0080f07c9aaa7e0000c05a78466dab48b464..3d735b9e9f9296696a72bfae1984e5882072ee20 100644 (file)
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -35,6 +35,8 @@
 #include <asm/rwsem.h>
 #include <asm/semaphore.h>
 
+#ifdef CONFIG_PPC_OCP
+
 #define OCP_MAX_IRQS   7
 #define MAX_EMACS      4
 #define OCP_IRQ_NA     -1      /* used when ocp device does not have an irq */
@@ -200,5 +202,6 @@ static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL);
 #include <asm/ibm_ocp.h>
 #endif
 
+#endif                         /* CONFIG_PPC_OCP */
 #endif                         /* __OCP_H__ */
 #endif                         /* __KERNEL__ */