git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pci-v4.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
pci.c
diff --git
a/arch/sparc/kernel/pci.c
b/arch/sparc/kernel/pci.c
index b36365f49478c573d715816d53582e2dfb153227..6f7251fd2eabc6b5b5790c2aa4486c84c042f814 100644
(file)
--- a/
arch/sparc/kernel/pci.c
+++ b/
arch/sparc/kernel/pci.c
@@
-674,11
+674,10
@@
struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
}
pci_of_scan_bus(pbm, node, bus);
- pci_bus_add_devices(bus);
pci_bus_register_of_sysfs(bus);
pci_claim_bus_resources(bus);
-
+ pci_bus_add_devices(bus);
return bus;
}