diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-10 22:48:17 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 23:43:34 -0500 |
commit | 25e81f925d4be0a0f60520e1c3c1b5af744404e1 (patch) | |
tree | 708cfc7238b80eef10f6353c97baf47df38870e2 /include/asm-powerpc/io.h | |
parent | cfad589f565bdaa69d45fb1c0db124727a6eaf6e (diff) |
[POWERPC] Make isa_mem_base common to 32 and 64 bits
This defines isa_mem_base on both 32 and 64 bits (it used to be 32 bits
only). This avoids a few ifdef's in later patches and potentially can
allow support for VGA text mode on 64 bits powerpc.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/io.h')
-rw-r--r-- | include/asm-powerpc/io.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h index e44cdfc8493..7be26f61575 100644 --- a/include/asm-powerpc/io.h +++ b/include/asm-powerpc/io.h | |||
@@ -50,15 +50,16 @@ extern int check_legacy_ioport(unsigned long base_port); | |||
50 | #define PCI_DRAM_OFFSET pci_dram_offset | 50 | #define PCI_DRAM_OFFSET pci_dram_offset |
51 | #else | 51 | #else |
52 | #define _IO_BASE pci_io_base | 52 | #define _IO_BASE pci_io_base |
53 | #define _ISA_MEM_BASE 0 | 53 | #define _ISA_MEM_BASE isa_mem_base |
54 | #define PCI_DRAM_OFFSET 0 | 54 | #define PCI_DRAM_OFFSET 0 |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | extern unsigned long isa_io_base; | 57 | extern unsigned long isa_io_base; |
58 | extern unsigned long isa_mem_base; | ||
59 | extern unsigned long pci_io_base; | 58 | extern unsigned long pci_io_base; |
60 | extern unsigned long pci_dram_offset; | 59 | extern unsigned long pci_dram_offset; |
61 | 60 | ||
61 | extern resource_size_t isa_mem_base; | ||
62 | |||
62 | #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO) | 63 | #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO) |
63 | #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits | 64 | #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits |
64 | #endif | 65 | #endif |