diff options
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 038f2610e734..f2b547ff7722 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -172,7 +172,7 @@ static int system_bus_speed; /* holds what we think is VESA/PCI bus speed */ | |||
172 | DECLARE_MUTEX(ide_cfg_sem); | 172 | DECLARE_MUTEX(ide_cfg_sem); |
173 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock); | 173 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock); |
174 | 174 | ||
175 | #ifdef CONFIG_BLK_DEV_IDEPCI | 175 | #ifdef CONFIG_IDEPCI_PCIBUS_ORDER |
176 | static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */ | 176 | static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */ |
177 | #endif | 177 | #endif |
178 | 178 | ||
@@ -1333,13 +1333,13 @@ static int __init ide_setup(char *s) | |||
1333 | return 1; | 1333 | return 1; |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | #ifdef CONFIG_BLK_DEV_IDEPCI | 1336 | #ifdef CONFIG_IDEPCI_PCIBUS_ORDER |
1337 | if (!strcmp(s, "ide=reverse")) { | 1337 | if (!strcmp(s, "ide=reverse")) { |
1338 | ide_scan_direction = 1; | 1338 | ide_scan_direction = 1; |
1339 | printk(" : Enabled support for IDE inverse scan order.\n"); | 1339 | printk(" : Enabled support for IDE inverse scan order.\n"); |
1340 | return 1; | 1340 | return 1; |
1341 | } | 1341 | } |
1342 | #endif /* CONFIG_BLK_DEV_IDEPCI */ | 1342 | #endif |
1343 | 1343 | ||
1344 | #ifdef CONFIG_BLK_DEV_IDEACPI | 1344 | #ifdef CONFIG_BLK_DEV_IDEACPI |
1345 | if (!strcmp(s, "ide=noacpi")) { | 1345 | if (!strcmp(s, "ide=noacpi")) { |
@@ -1599,9 +1599,9 @@ extern void __init h8300_ide_init(void); | |||
1599 | */ | 1599 | */ |
1600 | static void __init probe_for_hwifs (void) | 1600 | static void __init probe_for_hwifs (void) |
1601 | { | 1601 | { |
1602 | #ifdef CONFIG_BLK_DEV_IDEPCI | 1602 | #ifdef CONFIG_IDEPCI_PCIBUS_ORDER |
1603 | ide_scan_pcibus(ide_scan_direction); | 1603 | ide_scan_pcibus(ide_scan_direction); |
1604 | #endif /* CONFIG_BLK_DEV_IDEPCI */ | 1604 | #endif |
1605 | 1605 | ||
1606 | #ifdef CONFIG_ETRAX_IDE | 1606 | #ifdef CONFIG_ETRAX_IDE |
1607 | { | 1607 | { |