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/85xx | |
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/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_mds.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index a4995de6e737..4100e17f4cb2 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c | |||
@@ -38,11 +38,6 @@ | |||
38 | #include <asm/fs_pd.h> | 38 | #include <asm/fs_pd.h> |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #ifndef CONFIG_PCI | ||
42 | unsigned long isa_io_base = 0; | ||
43 | unsigned long isa_mem_base = 0; | ||
44 | #endif | ||
45 | |||
46 | #ifdef CONFIG_PCI | 41 | #ifdef CONFIG_PCI |
47 | static int mpc85xx_exclude_device(u_char bus, u_char devfn) | 42 | static int mpc85xx_exclude_device(u_char bus, u_char devfn) |
48 | { | 43 | { |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 40592540ec77..fa6b6be6cada 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c | |||
@@ -47,11 +47,6 @@ | |||
47 | #include <sysdev/fsl_soc.h> | 47 | #include <sysdev/fsl_soc.h> |
48 | #include "mpc85xx.h" | 48 | #include "mpc85xx.h" |
49 | 49 | ||
50 | #ifndef CONFIG_PCI | ||
51 | unsigned long isa_io_base = 0; | ||
52 | unsigned long isa_mem_base = 0; | ||
53 | #endif | ||
54 | |||
55 | static int cds_pci_slot = 2; | 50 | static int cds_pci_slot = 2; |
56 | static volatile u8 *cadmus; | 51 | static volatile u8 *cadmus; |
57 | 52 | ||
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 7310818bcc23..f55ef5b94f73 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -59,11 +59,6 @@ | |||
59 | #define DBG(fmt...) | 59 | #define DBG(fmt...) |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | #ifndef CONFIG_PCI | ||
63 | unsigned long isa_io_base = 0; | ||
64 | unsigned long isa_mem_base = 0; | ||
65 | #endif | ||
66 | |||
67 | /* ************************************************************************ | 62 | /* ************************************************************************ |
68 | * | 63 | * |
69 | * Setup the architecture | 64 | * Setup the architecture |