[PATCH][PPC32] Fix pmac compile after OCP changes

[Paul Mackerras]

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.

Please apply.

Thanks,
Paul.

diff -urN mporter-2.5/include/asm-ppc/ocp.h ppc-2.5/include/asm-ppc/ocp.h
--- mporter-2.5/include/asm-ppc/ocp.h	2004-05-14 19:09:48.517981840 +1000
+++ ppc-2.5/include/asm-ppc/ocp.h	2004-05-14 16:45:28.000000000 +1000
@@ -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 @@
 #include <asm/ibm_ocp.h>
 #endif
 
+#endif				/* CONFIG_PPC_OCP */
 #endif				/* __OCP_H__ */
 #endif				/* __KERNEL__ */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/