git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
[pandora-kernel.git]
/
drivers
/
ide
/
ide-scan-pci.c
diff --git
a/drivers/ide/ide-scan-pci.c
b/drivers/ide/ide-scan-pci.c
index
93d2e41
..
0e79eff
100644
(file)
--- a/
drivers/ide/ide-scan-pci.c
+++ b/
drivers/ide/ide-scan-pci.c
@@
-88,13
+88,8
@@
static int __init ide_scan_pcibus(void)
struct list_head *l, *n;
pre_init = 0;
struct list_head *l, *n;
pre_init = 0;
- if (!ide_scan_direction)
- while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
- ide_scan_pcidev(dev);
- else
- while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID,
- dev)))
- ide_scan_pcidev(dev);
+ while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
+ ide_scan_pcidev(dev);
/*
* Hand the drivers over to the PCI layer now we
/*
* Hand the drivers over to the PCI layer now we
@@
-107,7
+102,7
@@
static int __init ide_scan_pcibus(void)
if (__pci_register_driver(d, d->driver.owner,
d->driver.mod_name))
printk(KERN_ERR "%s: failed to register %s driver\n",
if (__pci_register_driver(d, d->driver.owner,
d->driver.mod_name))
printk(KERN_ERR "%s: failed to register %s driver\n",
- __
FUNCTION
__, d->driver.mod_name);
+ __
func
__, d->driver.mod_name);
}
return 0;
}
return 0;