Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[karo-tx-linux.git] / include / acpi / acpi_bus.h

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 8a388e766162bfcfe4a494ace6641c8a00affdab..fb7171b1bd22e900349126212f8fceb4f997d8e8 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -264,7 +264,6 @@ struct acpi_device_wakeup_flags {
 
 struct acpi_device_wakeup_state {
        u8 enabled:1;
-       u8 active:1;
 };
 
 struct acpi_device_wakeup {
@@ -320,7 +319,7 @@ struct acpi_bus_event {
        u32 data;
 };
 
-extern struct kset acpi_subsys;
+extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 /*
  * External Functions