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 */