From d17878a38980f3f61f1f8338a4baaf2b86a40b5e Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sun, 26 Mar 2006 01:54:16 -0700 Subject: [PATCH] --- yaml --- r: 24821 b: refs/heads/master c: 10267cdd0c2dee46a3f59d93fbfac7229d416dba h: refs/heads/master i: 24819: a7a40668811dae3d560cb64fb2ea59c004e9decd v: v3 --- [refs] | 2 +- trunk/arch/parisc/mm/ioremap.c | 8 +++----- trunk/include/asm-parisc/pci.h | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 31e925768abc..2b4cf6a88814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b29eac43023bb1b62081efa878c3cf72cb39c437 +refs/heads/master: 10267cdd0c2dee46a3f59d93fbfac7229d416dba diff --git a/trunk/arch/parisc/mm/ioremap.c b/trunk/arch/parisc/mm/ioremap.c index a5967b7d3726..5067ea90d91a 100644 --- a/trunk/arch/parisc/mm/ioremap.c +++ b/trunk/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/trunk/include/asm-parisc/pci.h b/trunk/include/asm-parisc/pci.h index fe7f6a2f5aa7..77bbafb7f73e 100644 --- a/trunk/include/asm-parisc/pci.h +++ b/trunk/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 */