summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-i386/ide.h12
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;
}
'button' href='/cgit/ralf/linux-ax25.git/log/drivers/crypto/hifn_795x.c?id=cd391e206f486955e216a61bd9ebcb0e142122e9'>logstatsplain -rw-r--r--ixp4xx_crypto.c36446logstatsplain -rw-r--r--padlock-aes.c12717logstatsplain -rw-r--r--padlock-sha.c8033logstatsplain -rw-r--r--padlock.h562logstatsplain