Преглед на файлове

[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>
Helge Deller преди 19 години
родител
ревизия
10267cdd0c
променени са 2 файла, в които са добавени 8 реда и са изтрити 5 реда
  1. 3 5
      arch/parisc/mm/ioremap.c
  2. 5 0
      include/asm-parisc/pci.h

+ 3 - 5
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
 

+ 5 - 0
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 */