diff options
Diffstat (limited to 'drivers/ide/setup-pci.c')
-rw-r--r-- | drivers/ide/setup-pci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index d89f84d41b08..63ef8aaa7b90 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -766,21 +766,20 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) | |||
766 | 766 | ||
767 | /** | 767 | /** |
768 | * ide_scan_pcibus - perform the initial IDE driver scan | 768 | * ide_scan_pcibus - perform the initial IDE driver scan |
769 | * @scan_direction: set for reverse order scanning | ||
770 | * | 769 | * |
771 | * Perform the initial bus rather than driver ordered scan of the | 770 | * Perform the initial bus rather than driver ordered scan of the |
772 | * PCI drivers. After this all IDE pci handling becomes standard | 771 | * PCI drivers. After this all IDE pci handling becomes standard |
773 | * module ordering not traditionally ordered. | 772 | * module ordering not traditionally ordered. |
774 | */ | 773 | */ |
775 | 774 | ||
776 | void __init ide_scan_pcibus (int scan_direction) | 775 | int __init ide_scan_pcibus(void) |
777 | { | 776 | { |
778 | struct pci_dev *dev = NULL; | 777 | struct pci_dev *dev = NULL; |
779 | struct pci_driver *d; | 778 | struct pci_driver *d; |
780 | struct list_head *l, *n; | 779 | struct list_head *l, *n; |
781 | 780 | ||
782 | pre_init = 0; | 781 | pre_init = 0; |
783 | if (!scan_direction) | 782 | if (!ide_scan_direction) |
784 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev))) | 783 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev))) |
785 | ide_scan_pcidev(dev); | 784 | ide_scan_pcidev(dev); |
786 | else | 785 | else |
@@ -801,5 +800,7 @@ void __init ide_scan_pcibus (int scan_direction) | |||
801 | printk(KERN_ERR "%s: failed to register %s driver\n", | 800 | printk(KERN_ERR "%s: failed to register %s driver\n", |
802 | __FUNCTION__, d->driver.mod_name); | 801 | __FUNCTION__, d->driver.mod_name); |
803 | } | 802 | } |
803 | |||
804 | return 0; | ||
804 | } | 805 | } |
805 | #endif | 806 | #endif |