summaryrefslogtreecommitdiff
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-23 00:48:00 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-23 00:48:00 +0400
commit76540969b1cf26349eb8867b57657b03c89025e5 (patch)
treedba8e982ad8b234413cba24aed0108d561714191 /drivers/acpi/pci_root.c
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
parentca499fc87ed945094d952da0eb7eea7dbeb1feec (diff)
downloadlinux-76540969b1cf26349eb8867b57657b03c89025e5.tar.xz
Merge back earlier acpi-hotplug material.
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0703bff5e60e..20360e480bd8 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -65,6 +65,9 @@ static struct acpi_scan_handler pci_root_handler = {
.ids = root_device_ids,
.attach = acpi_pci_root_add,
.detach = acpi_pci_root_remove,
+ .hotplug = {
+ .ignore = true,
+ },
};
static DEFINE_MUTEX(osc_lock);