diff options
| author | Helge Deller <deller@parisc-linux.org> | 2006-03-26 12:54:16 +0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-03-30 21:48:52 +0400 |
| commit | 10267cdd0c2dee46a3f59d93fbfac7229d416dba (patch) | |
| tree | 4057b966c302bef27be70a5cb0331317408298db | |
| parent | b29eac43023bb1b62081efa878c3cf72cb39c437 (diff) | |
| download | linux-10267cdd0c2dee46a3f59d93fbfac7229d416dba.tar.xz | |
[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>
| -rw-r--r-- | arch/parisc/mm/ioremap.c | 8 | ||||
| -rw-r--r-- | include/asm-parisc/pci.h | 5 |
2 files changed, 8 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 #ifdef CONFIG_EISA unsigned long end = phys_addr + size - 1; /* Support EISA addresses */ - if ((phys_addr >= 0x00080000 && end < 0x000fffff) - || (phys_addr >= 0x00500000 && end < 0x03bfffff)) { - phys_addr |= 0xfc000000; -#warning "FIXME: EISA regions do not work yet..." - return NULL; /* XXX */ + if ((phys_addr >= 0x00080000 && end < 0x000fffff) || + (phys_addr >= 0x00500000 && end < 0x03bfffff)) { + phys_addr |= F_EXTEND(0xfc000000); } #endif diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h index fe7f6a2f5aa7..77bbafb7f73e 100644 --- a/include/asm-parisc/pci.h +++ b/include/asm-parisc/pci.h @@ -289,4 +289,9 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev) { } +static inline void pcibios_penalize_isa_irq(int irq, int active) +{ + /* We don't need to penalize isa irq's */ +} + #endif /* __ASM_PARISC_PCI_H */ |