summaryrefslogtreecommitdiff
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 16:41:08 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 16:41:08 +0400
commitd1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch)
tree08a8a8dab1955bb07724028ece639267502a07ba /drivers/acpi/bus.c
parentcaa73ea158de9419f08e456f2716c71d1f06012a (diff)
parentf244d8b623dae7a7bc695b0336f67729b95a9736 (diff)
downloadlinux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.xz
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Conflicts: include/acpi/acpi_bus.h
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2c38ae22c17f..384da5ab5955 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -149,6 +149,16 @@ int acpi_bus_get_private_data(acpi_handle handle, void **data)
}
EXPORT_SYMBOL(acpi_bus_get_private_data);
+void acpi_bus_no_hotplug(acpi_handle handle)
+{
+ struct acpi_device *adev = NULL;
+
+ acpi_bus_get_device(handle, &adev);
+ if (adev)
+ adev->flags.no_hotplug = true;
+}
+EXPORT_SYMBOL_GPL(acpi_bus_no_hotplug);
+
static void acpi_print_osc_error(acpi_handle handle,
struct acpi_osc_context *context, char *error)
{