diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/ide/ide-scan-pci.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ide/ide-scan-pci.c')
| -rw-r--r-- | drivers/ide/ide-scan-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c index 0e79efff1deb..c3da53e7bb2b 100644 --- a/drivers/ide/ide-scan-pci.c +++ b/drivers/ide/ide-scan-pci.c | |||
| @@ -88,7 +88,7 @@ static int __init ide_scan_pcibus(void) | |||
| 88 | struct list_head *l, *n; | 88 | struct list_head *l, *n; |
| 89 | 89 | ||
| 90 | pre_init = 0; | 90 | pre_init = 0; |
| 91 | while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev))) | 91 | for_each_pci_dev(dev) |
| 92 | ide_scan_pcidev(dev); | 92 | ide_scan_pcidev(dev); |
| 93 | 93 | ||
| 94 | /* | 94 | /* |