diff options
author | Paul Mackerras <paulus@samba.org> | 2008-05-12 08:57:51 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-12 08:57:51 -0400 |
commit | 0d4b6b901c3d41beb0e1620316aee0aa234edf7f (patch) | |
tree | 6bf52878511c86cc33b2b95ffba53863fa9c01f0 /arch | |
parent | 6a8b23086c82d7cc4f424518532c8b10d95715c0 (diff) |
[POWERPC] ppc: More compile fixes
This fixes a few more miscellaneous compile problems with ARCH=ppc.
1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
3. Include <linux/proc_fs.h> in residual.c for the
definition of create_proc_read_entry.
4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/setup.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/residual.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index f1d2cdc5331b..c71d37dc6a88 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
@@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y) | |||
10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o |
13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | ||
13 | endif | 14 | endif |
14 | 15 | ||
15 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ | 16 | obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ |
@@ -23,4 +24,3 @@ obj-$(CONFIG_SMP) += locks.o | |||
23 | endif | 24 | endif |
24 | 25 | ||
25 | obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o | 26 | obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o |
26 | obj-$(CONFIG_HAS_IOMEM) += devres.o | ||
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index bfddfdee0b65..51e8094f52d6 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <asm/nvram.h> | 36 | #include <asm/nvram.h> |
37 | #include <asm/xmon.h> | 37 | #include <asm/xmon.h> |
38 | #include <asm/ocp.h> | 38 | #include <asm/ocp.h> |
39 | #include <asm/irq.h> | ||
39 | 40 | ||
40 | #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ | 41 | #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ |
41 | defined(CONFIG_PPC_MPC52xx)) | 42 | defined(CONFIG_PPC_MPC52xx)) |
diff --git a/arch/ppc/platforms/residual.c b/arch/ppc/platforms/residual.c index 18495e754e30..d687b0f8763b 100644 --- a/arch/ppc/platforms/residual.c +++ b/arch/ppc/platforms/residual.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
39 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
41 | #include <linux/proc_fs.h> | ||
41 | 42 | ||
42 | #include <asm/sections.h> | 43 | #include <asm/sections.h> |
43 | #include <asm/mmu.h> | 44 | #include <asm/mmu.h> |