diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
| commit | 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (patch) | |
| tree | df468cdc2d1556fdc24a023baeef4b5274baf702 /include | |
| parent | 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff) | |
| parent | 5527c8bee27fa063dcec0e020fb8c242ba4270c2 (diff) | |
Pull alexey-fixes into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 7b74b60a68a4..19c3ead2a90b 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -168,8 +168,7 @@ struct acpi_device_flags { | |||
| 168 | u32 power_manageable:1; | 168 | u32 power_manageable:1; |
| 169 | u32 performance_manageable:1; | 169 | u32 performance_manageable:1; |
| 170 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ | 170 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ |
| 171 | u32 force_power_state:1; | 171 | u32 reserved:20; |
| 172 | u32 reserved:19; | ||
| 173 | }; | 172 | }; |
| 174 | 173 | ||
| 175 | /* File System */ | 174 | /* File System */ |