lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PARISC] Fixup CONFIG_EISA a bit

Browse Source 
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>
This commit is contained in:
Helge Deller
2006-03-26 01:54:16 -07:00
committed by Kyle McMartin
parent b29eac4302
commit 10267cdd0c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/parisc/mm/ioremap.c
View File

@@ -135,11 +135,9 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
unsigned long end = phys_addr + size - 1; unsigned long end = phys_addr + size - 1;
/* Support EISA addresses */ /* Support EISA addresses */
if ((phys_addr >= 0x00080000 && end < 0x000fffff) if ((phys_addr >= 0x00080000 && end < 0x000fffff) ||
|| (phys_addr >= 0x00500000 && end < 0x03bfffff)) { (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
phys_addr |= 0xfc000000; phys_addr |= F_EXTEND(0xfc000000);
#warning "FIXME: EISA regions do not work yet..."
return NULL; /* XXX */
} }
#endif #endif

5
include/asm-parisc/pci.h
View File

@@ -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 */ #endif /* __ASM_PARISC_PCI_H */