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 /include/asm-powerpc | |
| 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 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/mpc86xx.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-powerpc/mpc86xx.h b/include/asm-powerpc/mpc86xx.h index b85df45b1a84..15f650f987e7 100644 --- a/include/asm-powerpc/mpc86xx.h +++ b/include/asm-powerpc/mpc86xx.h | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #ifdef CONFIG_PPC_86xx | 20 | #ifdef CONFIG_PPC_86xx |
| 21 | 21 | ||
| 22 | #define _IO_BASE isa_io_base | ||
| 23 | #define _ISA_MEM_BASE isa_mem_base | ||
| 24 | #ifdef CONFIG_PCI | ||
| 25 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
| 26 | #endif | ||
| 27 | |||
| 28 | #define CPU0_BOOT_RELEASE 0x01000000 | 22 | #define CPU0_BOOT_RELEASE 0x01000000 |
| 29 | #define CPU1_BOOT_RELEASE 0x02000000 | 23 | #define CPU1_BOOT_RELEASE 0x02000000 |
| 30 | #define CPU_ALL_RELEASED (CPU0_BOOT_RELEASE | CPU1_BOOT_RELEASE) | 24 | #define CPU_ALL_RELEASED (CPU0_BOOT_RELEASE | CPU1_BOOT_RELEASE) |