Commit c13dbf34 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent c1da7a14
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include <asm/rwsem.h> #include <asm/rwsem.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#ifdef CONFIG_PPC_OCP
#define OCP_MAX_IRQS 7 #define OCP_MAX_IRQS 7
#define MAX_EMACS 4 #define MAX_EMACS 4
#define OCP_IRQ_NA -1 /* used when ocp device does not have an irq */ #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); ...@@ -200,5 +202,6 @@ static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL);
#include <asm/ibm_ocp.h> #include <asm/ibm_ocp.h>
#endif #endif
#endif /* CONFIG_PPC_OCP */
#endif /* __OCP_H__ */ #endif /* __OCP_H__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment