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/pci/remove.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/pci/remove.c')
-rw-r--r-- | drivers/pci/remove.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 176615e7231f..7f87beed35ac 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c | |||
@@ -73,8 +73,6 @@ void pci_remove_bus(struct pci_bus *pci_bus) | |||
73 | return; | 73 | return; |
74 | 74 | ||
75 | pci_remove_legacy_files(pci_bus); | 75 | pci_remove_legacy_files(pci_bus); |
76 | device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity); | ||
77 | device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity); | ||
78 | device_unregister(&pci_bus->dev); | 76 | device_unregister(&pci_bus->dev); |
79 | } | 77 | } |
80 | EXPORT_SYMBOL(pci_remove_bus); | 78 | EXPORT_SYMBOL(pci_remove_bus); |