diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
| commit | d1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch) | |
| tree | 08a8a8dab1955bb07724028ece639267502a07ba /include/acpi | |
| parent | caa73ea158de9419f08e456f2716c71d1f06012a (diff) | |
| parent | f244d8b623dae7a7bc695b0336f67729b95a9736 (diff) | |
| download | op-kernel-dev-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.zip op-kernel-dev-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.gz | |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Conflicts:
include/acpi/acpi_bus.h
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 48d3025..e4ab7be 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -163,7 +163,8 @@ struct acpi_device_flags { u32 match_driver:1; u32 initialized:1; u32 visited:1; - u32 reserved:25; + u32 no_hotplug:1; + u32 reserved:24; }; /* File System */ @@ -344,6 +345,7 @@ extern struct kobject *acpi_kobj; extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); void acpi_bus_private_data_handler(acpi_handle, void *); int acpi_bus_get_private_data(acpi_handle, void **); +void acpi_bus_no_hotplug(acpi_handle handle); extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32); extern int register_acpi_notifier(struct notifier_block *); extern int unregister_acpi_notifier(struct notifier_block *); |
