summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-14 23:22:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-14 23:22:45 +0200
commitf3ce717e60572421f56d89c9a85ac42e634d16e7 (patch)
tree46b85329773c7908378f90e4e8e86205ebfd229f /drivers/pci
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff)
parente73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff)
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_ibm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index c35e8ad6db01..5394fffdf167 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -270,7 +270,6 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
if (subevent == 0x80) {
dbg("%s: generationg bus event\n", __func__);
- acpi_bus_generate_proc_event(note->device, note->event, detail);
acpi_bus_generate_netlink_event(note->device->pnp.device_class,
dev_name(&note->device->dev),
note->event, detail);