diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/asm-ppc/io.h | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'include/asm-ppc/io.h')
| -rw-r--r-- | include/asm-ppc/io.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index fd8f1879c..051aed929 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -19,7 +19,9 @@ #define PREP_ISA_MEM_BASE 0xc0000000 #define PREP_PCI_DRAM_OFFSET 0x80000000 -#ifdef CONFIG_8xx +#if defined(CONFIG_4xx) +#include <asm/board.h> +#elif defined(CONFIG_8xx) #include <asm/mpc8xx.h> #else #ifdef CONFIG_APUS @@ -34,7 +36,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_8xx */ +#endif #define readb(addr) in_8((volatile unsigned char *)(addr)) #define writeb(b,addr) out_8((volatile unsigned char *)(addr), (b)) @@ -98,6 +100,8 @@ extern void _outsw_ns(volatile unsigned short *port, const void *buf, int ns); extern void _insl_ns(volatile unsigned long *port, void *buf, int nl); extern void _outsl_ns(volatile unsigned long *port, const void *buf, int nl); +#define IO_SPACE_LIMIT 0xffff + #define memset_io(a,b,c) memset((a),(b),(c)) #define memcpy_fromio(a,b,c) memcpy((a),(b),(c)) #define memcpy_toio(a,b,c) memcpy((a),(b),(c)) |