diff options
author | Arnd Bergmann <arnd@arndb.de> | 2007-06-17 19:06:56 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 02:56:43 -0400 |
commit | 3dfaa762b59743719f00f2dc2f559de59f5502f7 (patch) | |
tree | b060d4eb45678cf7bccfcf4d4fb9bc3640868511 /arch/powerpc/platforms/86xx | |
parent | 143056013fa22eaf1e53e052e9c9f57ef194e5f7 (diff) |
[POWERPC] kill isa_{io,mem}_base definitions for !PCI
When CONFIG_PCI is disabled, the definitions for isa_io_base,
isa_mem_base and pci_dram_offset are entirely unused, but they
can result in link failure because they are defined in multiple
places.
The easiest fix is to just remove all these definitions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 23f3e1bbf861..042dbce89771 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | |||
@@ -44,13 +44,6 @@ | |||
44 | #define DBG(fmt...) do { } while(0) | 44 | #define DBG(fmt...) do { } while(0) |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #ifndef CONFIG_PCI | ||
48 | unsigned long isa_io_base = 0; | ||
49 | unsigned long isa_mem_base = 0; | ||
50 | unsigned long pci_dram_offset = 0; | ||
51 | #endif | ||
52 | |||
53 | |||
54 | #ifdef CONFIG_PCI | 47 | #ifdef CONFIG_PCI |
55 | static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc) | 48 | static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc) |
56 | { | 49 | { |