summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep/main.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/sleep/main.c
parent0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff)
parent27663c5855b10af9ec67bc7dfba001426ba21222 (diff)
downloadlinux-7674416db4ee3d43813dddb650364ca994755256.tar.bz2
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/sleep/main.c')
-rw-r--r--drivers/acpi/sleep/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index cc344d4252c9..76037883cd13 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -495,7 +495,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
struct acpi_device *adev;
char acpi_method[] = "_SxD";
- unsigned long d_min, d_max;
+ unsigned long long d_min, d_max;
if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
printk(KERN_DEBUG "ACPI handle has no context!\n");