X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Facpi%2Fdock.c;h=5b30b8d91d716126cdd3305d61ee8fd625eea016;hb=62663ea8220366472fe20462831f2d69d7987439;hp=913bb1e89dd60016c09d80bfc2585dc7a1b0f9b8;hpb=3156d1ed68ff387a4f0b86c505ed76368f576c54;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 913bb1e89dd..5b30b8d91d7 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -294,7 +294,7 @@ EXPORT_SYMBOL_GPL(is_dock_device);
  */
 static int dock_present(struct dock_station *ds)
 {
-	unsigned long sta;
+	unsigned long long sta;
 	acpi_status status;
 
 	if (ds) {
@@ -900,7 +900,7 @@ static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
 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,
@@ -908,7 +908,7 @@ static ssize_t show_dock_uid(struct device *dev,
 	if (ACPI_FAILURE(status))
 	    return 0;
 
-	return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
+	return snprintf(buf, PAGE_SIZE, "%llx\n", lbuf);
 }
 static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);