aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/ac.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:33:29 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:33:29 -0400
commit7674416db4ee3d43813dddb650364ca994755256 (patch)
tree1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/ac.c
parent0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff)
parent27663c5855b10af9ec67bc7dfba001426ba21222 (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 8b6a84a43b1..d72a1b6c8a9 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);