]> git.neil.brown.name Git - history.git/commitdiff
Fix MELAN config compile by just making the PIC range
authorLinus Torvalds <torvalds@home.transmeta.com>
Sat, 21 Jun 2003 03:31:03 +0000 (20:31 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sat, 21 Jun 2003 03:31:03 +0000 (20:31 -0700)
allocation have only the two standard ports by default.

Which was what MELAN really wanted, and others don't
really care.

Pointed out by Roland Dreier

include/asm-i386/mach-default/mach_resources.h

index 2b0eadaaca20120aa0a2eb8d517121b3b0146a3e..b37858d0d0bdc2017764ec9b5ae0e0c472f92256 100644 (file)
@@ -9,18 +9,14 @@
 
 struct resource standard_io_resources[] = {
        { "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
-       { "pic1", 0x20, 0x3f, IORESOURCE_BUSY },
+       { "pic1", 0x20, 0x21, IORESOURCE_BUSY },
        { "timer", 0x40, 0x5f, IORESOURCE_BUSY },
        { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
        { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
-       { "pic2", 0xa0, 0xbf, IORESOURCE_BUSY },
+       { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY },
        { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
        { "fpu", 0xf0, 0xff, IORESOURCE_BUSY }
 };
-#ifdef CONFIG_MELAN
-standard_io_resources[1] = { "pic1", 0x20, 0x21, IORESOURCE_BUSY };
-standard_io_resources[5] = { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY };
-#endif
 
 #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))