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/bus.c | |
| parent | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff) | |
| parent | 27663c5855b10af9ec67bc7dfba001426ba21222 (diff) | |
| download | kernel_samsung_crespo-7674416db4ee3d43813dddb650364ca994755256.zip kernel_samsung_crespo-7674416db4ee3d43813dddb650364ca994755256.tar.gz kernel_samsung_crespo-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/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index b11400e..c797c64 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -94,7 +94,7 @@ EXPORT_SYMBOL(acpi_bus_get_device); int acpi_bus_get_status(struct acpi_device *device) { acpi_status status = AE_OK; - unsigned long sta = 0; + unsigned long long sta = 0; if (!device) @@ -172,7 +172,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state) int result = 0; acpi_status status = 0; struct acpi_device *device = NULL; - unsigned long psc = 0; + unsigned long long psc = 0; result = acpi_bus_get_device(handle, &device); |