diff options
author | Helge Deller <deller@parisc-linux.org> | 2006-03-26 03:54:16 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-03-30 12:48:52 -0500 |
commit | 10267cdd0c2dee46a3f59d93fbfac7229d416dba (patch) | |
tree | 4057b966c302bef27be70a5cb0331317408298db /arch/parisc/mm | |
parent | b29eac43023bb1b62081efa878c3cf72cb39c437 (diff) |
[PARISC] Fixup CONFIG_EISA a bit
Fix up some ISA/EISA stuff.
(Note: isa_ accessors have been removed from asm/io.h)
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/mm')
-rw-r--r-- | arch/parisc/mm/ioremap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index a5967b7d3726..5067ea90d91a 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c | |||
@@ -135,11 +135,9 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l | |||
135 | #ifdef CONFIG_EISA | 135 | #ifdef CONFIG_EISA |
136 | unsigned long end = phys_addr + size - 1; | 136 | unsigned long end = phys_addr + size - 1; |
137 | /* Support EISA addresses */ | 137 | /* Support EISA addresses */ |
138 | if ((phys_addr >= 0x00080000 && end < 0x000fffff) | 138 | if ((phys_addr >= 0x00080000 && end < 0x000fffff) || |
139 | || (phys_addr >= 0x00500000 && end < 0x03bfffff)) { | 139 | (phys_addr >= 0x00500000 && end < 0x03bfffff)) { |
140 | phys_addr |= 0xfc000000; | 140 | phys_addr |= F_EXTEND(0xfc000000); |
141 | #warning "FIXME: EISA regions do not work yet..." | ||
142 | return NULL; /* XXX */ | ||
143 | } | 141 | } |
144 | #endif | 142 | #endif |
145 | 143 | ||