From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 03:33:29 +0000 (-0400)
Subject: Merge branch 'ull' into test
X-Git-Tag: v2.6.28-rc1~26^2~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7674416db4ee3d43813dddb650364ca994755256;p=linux-2.6-omap-h63xx.git

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>
---

7674416db4ee3d43813dddb650364ca994755256
diff --cc drivers/acpi/dock.c
index 913bb1e89dd,94857112b64..5b30b8d91d7
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@@ -900,9 -727,7 +900,9 @@@ static DEVICE_ATTR(undock, S_IWUSR, NUL
  static ssize_t show_dock_uid(struct device *dev,
  			     struct device_attribute *attr, char *buf)
  {
- 	unsigned long lbuf;
+ 	unsigned long long lbuf;
 +	struct dock_station *dock_station = *((struct dock_station **)
 +		dev->platform_data);
  	acpi_status status = acpi_evaluate_integer(dock_station->handle,
  					"_UID", NULL, &lbuf);
  	if (ACPI_FAILURE(status))
diff --cc drivers/acpi/power.c
index e88edc00866,89e5d2a8c33..a1718e56103
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -136,16 -128,16 +136,16 @@@ acpi_power_get_context(acpi_handle hand
  	return 0;
  }
  
 -static int acpi_power_get_state(struct acpi_power_resource *resource, int *state)
 +static int acpi_power_get_state(acpi_handle handle, int *state)
  {
  	acpi_status status = AE_OK;
- 	unsigned long sta = 0;
+ 	unsigned long long sta = 0;
  
  
 -	if (!resource || !state)
 +	if (!handle || !state)
  		return -EINVAL;
  
 -	status = acpi_evaluate_integer(resource->device->handle, "_STA", NULL, &sta);
 +	status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
  	if (ACPI_FAILURE(status))
  		return -ENODEV;