diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-18 14:03:38 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-18 14:03:38 -0700 |
| commit | 330ebfe36e3dc21f656dfa59d69895e21bf6e9da (patch) | |
| tree | 7eb064b76d37df212c27506798e7269acd14c327 /drivers/pci/bus.c | |
| parent | d9cdfb8705b5b40087a437c3a58cf9dff59a0a46 (diff) | |
| parent | ef83b0781a73f9efcb1228256bfdfb97fc9533a8 (diff) | |
Merge branch 'pci/deletion' into next
* pci/deletion:
PCI: Remove from bus_list and release resources in pci_release_dev()
PCI: Move pci_proc_attach_device() to pci_bus_add_device()
PCI: Use device_release_driver() in pci_stop_root_bus()
PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()
Conflicts:
drivers/pci/remove.c
Diffstat (limited to 'drivers/pci/bus.c')
| -rw-r--r-- | drivers/pci/bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index fc1b7401374..a037d81f21e 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -176,6 +176,7 @@ int pci_bus_add_device(struct pci_dev *dev) */ pci_fixup_device(pci_fixup_final, dev); pci_create_sysfs_dev_files(dev); + pci_proc_attach_device(dev); dev->match_driver = true; retval = device_attach(&dev->dev); |