diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/pci/pci-driver.c | |
parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index a3c1755b2f28..39e80fcef4b3 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -434,11 +434,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner, | |||
434 | drv->driver.mod_name = mod_name; | 434 | drv->driver.mod_name = mod_name; |
435 | drv->driver.kobj.ktype = &pci_driver_kobj_type; | 435 | drv->driver.kobj.ktype = &pci_driver_kobj_type; |
436 | 436 | ||
437 | if (pci_multithread_probe) | ||
438 | drv->driver.multithread_probe = pci_multithread_probe; | ||
439 | else | ||
440 | drv->driver.multithread_probe = drv->multithread_probe; | ||
441 | |||
442 | spin_lock_init(&drv->dynids.lock); | 437 | spin_lock_init(&drv->dynids.lock); |
443 | INIT_LIST_HEAD(&drv->dynids.list); | 438 | INIT_LIST_HEAD(&drv->dynids.list); |
444 | 439 | ||
@@ -574,6 +569,7 @@ struct bus_type pci_bus_type = { | |||
574 | 569 | ||
575 | static int __init pci_driver_init(void) | 570 | static int __init pci_driver_init(void) |
576 | { | 571 | { |
572 | pci_bus_type.multithread_probe = pci_multithread_probe; | ||
577 | return bus_register(&pci_bus_type); | 573 | return bus_register(&pci_bus_type); |
578 | } | 574 | } |
579 | 575 | ||