From 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 4 Dec 1999 03:58:56 +0000 Subject: Merge with Linux 2.3.21. --- include/asm-ppc/io.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'include/asm-ppc/io.h') diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 53455fe2f..fd8f1879c 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -19,11 +19,9 @@ #define PREP_ISA_MEM_BASE 0xc0000000 #define PREP_PCI_DRAM_OFFSET 0x80000000 -#ifdef CONFIG_MBX -#define _IO_BASE 0x80000000 -#define _ISA_MEM_BASE 0 -#define PCI_DRAM_OFFSET 0x80000000 -#else /* CONFIG_MBX8xx */ +#ifdef CONFIG_8xx +#include +#else #ifdef CONFIG_APUS #define _IO_BASE 0 #define _ISA_MEM_BASE 0 @@ -36,7 +34,7 @@ extern unsigned long pci_dram_offset; #define _ISA_MEM_BASE isa_mem_base #define PCI_DRAM_OFFSET pci_dram_offset #endif /* CONFIG_APUS */ -#endif /* CONFIG_MBX8xx */ +#endif /* CONFIG_8xx */ #define readb(addr) in_8((volatile unsigned char *)(addr)) #define writeb(b,addr) out_8((volatile unsigned char *)(addr), (b)) -- cgit v1.2.3