diff options
author | Arnd Bergmann <arnd@arndb.de> | 2007-06-18 01:06:56 +0200 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 01:56:43 -0500 |
commit | 3dfaa762b59743719f00f2dc2f559de59f5502f7 (patch) | |
tree | b060d4eb45678cf7bccfcf4d4fb9bc3640868511 /arch/powerpc/platforms/85xx/mpc85xx_ads.c | |
parent | 143056013fa22eaf1e53e052e9c9f57ef194e5f7 (diff) | |
download | linux-3dfaa762b59743719f00f2dc2f559de59f5502f7.tar.gz linux-3dfaa762b59743719f00f2dc2f559de59f5502f7.tar.bz2 linux-3dfaa762b59743719f00f2dc2f559de59f5502f7.zip |
[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/mpc85xx_ads.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 5 |
1 files changed, 0 insertions, 5 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 @@ #include <asm/fs_pd.h> #endif -#ifndef CONFIG_PCI -unsigned long isa_io_base = 0; -unsigned long isa_mem_base = 0; -#endif - #ifdef CONFIG_PCI static int mpc85xx_exclude_device(u_char bus, u_char devfn) { |