Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 8 insertions, 4 deletions

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 859ebf4da632..79dfab87135d 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -41,13 +41,17 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
+        if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+                switch(index) {
+                        case 2: return 0x1e8;
+                        case 3: return 0x168;
+                        case 4: return 0x1e0;
+                        case 5: return 0x160;
+                }
+        }
         switch (index) {
                 case 0: return 0x1f0;
                 case 1: return 0x170;
-                case 2: return 0x1e8;
-                case 3: return 0x168;
-                case 4: return 0x1e0;
-                case 5: return 0x160;
                 default:
                         return 0;
         }