git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
include
/
acpi
/
acpi_bus.h
diff --git
a/include/acpi/acpi_bus.h
b/include/acpi/acpi_bus.h
index
3a10ef5
..
6cd5b64
100644
(file)
--- a/
include/acpi/acpi_bus.h
+++ b/
include/acpi/acpi_bus.h
@@
-210,7
+210,7
@@
struct acpi_device_power_state {
struct acpi_device_power {
int state; /* Current state */
struct acpi_device_power_flags flags;
struct acpi_device_power {
int state; /* Current state */
struct acpi_device_power_flags flags;
- struct acpi_device_power_state states[
4]; /* Power states (D0-D3
) */
+ struct acpi_device_power_state states[
ACPI_D_STATE_COUNT]; /* Power states (D0-D3Cold
) */
};
/* Performance Management */
};
/* Performance Management */