diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:33:29 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:33:29 -0400 |
| commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
| tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/container.c | |
| parent | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff) | |
| parent | 27663c5855b10af9ec67bc7dfba001426ba21222 (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/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 03ea8478e393..134818b265a9 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -76,7 +76,7 @@ static int is_device_present(acpi_handle handle) | |||
| 76 | { | 76 | { |
| 77 | acpi_handle temp; | 77 | acpi_handle temp; |
| 78 | acpi_status status; | 78 | acpi_status status; |
| 79 | unsigned long sta; | 79 | unsigned long long sta; |
| 80 | 80 | ||
| 81 | 81 | ||
| 82 | status = acpi_get_handle(handle, "_STA", &temp); | 82 | status = acpi_get_handle(handle, "_STA", &temp); |