Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10267cdd authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

[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: default avatarHelge Deller <deller@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent b29eac43

arch/parisc/mm/ioremap.c

+3 −5
Original line number Diff line number Diff line
@@ -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

include/asm-parisc/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */