diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:36:11 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:36:11 -0400 |
| commit | 8f2ddb37e564a9616c05fa0d5652e0049072a730 (patch) | |
| tree | a28df8762bb77979b0ff8cc14cfcc12a1204ca09 /include/acpi/acpi_bus.h | |
| parent | 5b542e4422766d644ca303b8a47b27ec9eeeef3a (diff) | |
| parent | 74ce1468128e299fe6a85e7e78e528e45e72d6d9 (diff) | |
| download | linux-8f2ddb37e564a9616c05fa0d5652e0049072a730.tar.gz linux-8f2ddb37e564a9616c05fa0d5652e0049072a730.tar.bz2 linux-8f2ddb37e564a9616c05fa0d5652e0049072a730.zip | |
Pull bugzilla-5000 into release branch
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 8c7590fdd822..a2b3e390a503 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -26,7 +26,7 @@ #ifndef __ACPI_BUS_H__ #define __ACPI_BUS_H__ -#include <linux/kobject.h> +#include <linux/device.h> #include <acpi/acpi.h> @@ -169,7 +169,8 @@ struct acpi_device_flags { u32 power_manageable:1; u32 performance_manageable:1; u32 wake_capable:1; /* Wakeup(_PRW) supported? */ - u32 reserved:20; + u32 force_power_state:1; + u32 reserved:19; }; /* File System */ @@ -296,6 +297,7 @@ struct acpi_device { struct acpi_driver *driver; void *driver_data; struct kobject kobj; + struct device dev; }; #define acpi_driver_data(d) ((d)->driver_data) |