diff options
author | Len Brown <len.brown@intel.com> | 2008-10-23 03:33:29 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-23 03:33:29 (GMT) |
commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/ac.c | |
parent | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff) | |
parent | 27663c5855b10af9ec67bc7dfba001426ba21222 (diff) | |
download | linux-7674416db4ee3d43813dddb650364ca994755256.tar.xz |
Merge branch 'ull' into test
Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ac.c')
-rw-r--r-- | drivers/acpi/ac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 8b6a84a..d72a1b6 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -85,7 +85,7 @@ struct acpi_ac { struct power_supply charger; #endif struct acpi_device * device; - unsigned long state; + unsigned long long state; }; #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger); |