summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-10-29 17:30:21 -0400
committerLen Brown <len.brown@intel.com>2007-10-29 17:30:21 -0400
commit14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (patch)
treedf468cdc2d1556fdc24a023baeef4b5274baf702 /include
parent6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff)
parent5527c8bee27fa063dcec0e020fb8c242ba4270c2 (diff)
downloadlinux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.tar.gz
linux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.tar.bz2
linux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.zip
Pull alexey-fixes into release branch
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpi_bus.h3
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 {
u32 power_manageable:1;
u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */
- u32 force_power_state:1;
- u32 reserved:19;
+ u32 reserved:20;
};
/* File System */