Merge branch 'ull' into test

[linux-2.6-omap-h63xx.git] / drivers / acpi / container.c

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 03ea8478e393846f7a6aa559f8cfb16faeccce88..134818b265a9fae8ff5aec7af3e443d4cc6d7c59 100644 (file)
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -76,7 +76,7 @@ static int is_device_present(acpi_handle handle)
 {
        acpi_handle temp;
        acpi_status status;
-       unsigned long sta;
+       unsigned long long sta;
 
 
        status = acpi_get_handle(handle, "_STA", &temp);