diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-11 14:48:17 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-12-11 15:43:34 +1100 |
| commit | 25e81f925d4be0a0f60520e1c3c1b5af744404e1 (patch) | |
| tree | 708cfc7238b80eef10f6353c97baf47df38870e2 /include/asm-powerpc/io.h | |
| parent | Merge branch 'linux-2.6' into for-2.6.25 (diff) | |
| download | linux-dev-25e81f925d4be0a0f60520e1c3c1b5af744404e1.tar.xz linux-dev-25e81f925d4be0a0f60520e1c3c1b5af744404e1.zip | |
[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 e44cdfc8493a..7be26f615755 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); #define PCI_DRAM_OFFSET pci_dram_offset #else #define _IO_BASE pci_io_base -#define _ISA_MEM_BASE 0 +#define _ISA_MEM_BASE isa_mem_base #define PCI_DRAM_OFFSET 0 #endif extern unsigned long isa_io_base; -extern unsigned long isa_mem_base; extern unsigned long pci_io_base; extern unsigned long pci_dram_offset; +extern resource_size_t isa_mem_base; + #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO) #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits #endif |