summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci_32.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-12-11 04:48:17 +0100
committerPaul Mackerras <paulus@samba.org>2007-12-11 05:43:34 +0100
commit25e81f925d4be0a0f60520e1c3c1b5af744404e1 (patch)
tree708cfc7238b80eef10f6353c97baf47df38870e2 /arch/powerpc/kernel/pci_32.c
parentMerge branch 'linux-2.6' into for-2.6.25 (diff)
downloadlinux-25e81f925d4be0a0f60520e1c3c1b5af744404e1.tar.xz
linux-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 'arch/powerpc/kernel/pci_32.c')
-rw-r--r--arch/powerpc/kernel/pci_32.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 096c97e03aa6..a33c2820c200 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -32,7 +32,6 @@
#endif
unsigned long isa_io_base = 0;
-unsigned long isa_mem_base = 0;
unsigned long pci_dram_offset = 0;
int pcibios_assign_bus_offset = 1;