diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/parisc/dino.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/parisc/dino.c')
| -rw-r--r-- | drivers/parisc/dino.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index b0d2a73d1d47..2f2dbef2c3b7 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
| @@ -993,6 +993,7 @@ dino_driver_callback(struct parisc_device *dev) | |||
| 993 | bus = pci_scan_bus_parented(&dev->dev, dino_current_bus, | 993 | bus = pci_scan_bus_parented(&dev->dev, dino_current_bus, |
| 994 | &dino_cfg_ops, NULL); | 994 | &dino_cfg_ops, NULL); |
| 995 | if(bus) { | 995 | if(bus) { |
| 996 | pci_bus_add_devices(bus); | ||
| 996 | /* This code *depends* on scanning being single threaded | 997 | /* This code *depends* on scanning being single threaded |
| 997 | * if it isn't, this global bus number count will fail | 998 | * if it isn't, this global bus number count will fail |
| 998 | */ | 999 | */ |