diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
| commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
| tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/ac.c | |
| parent | Merge branch 'thinkpad' into test (diff) | |
| parent | ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels (diff) | |
| download | linux-7674416db4ee3d43813dddb650364ca994755256.tar.xz linux-7674416db4ee3d43813dddb650364ca994755256.zip | |
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 8b6a84a43b15..d72a1b6c8a94 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); |