From 20ab364b78a9475f1b79efef25fc6bf498099524 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Fri, 2 Dec 2011 21:57:50 -0800
Subject: [PATCH] --- yaml --- r: 282355 b: refs/heads/master c:
 ce63920b395f1476e2d28cca16a56919289f0b62 h: refs/heads/master i:   282353:
 fe5af6026facce0a3be64f6944e822fcf77b976c   282351:
 e56c075f4ffbb3c32b40e437308d86224131a6e0 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-input.c | 8 --------
 trunk/include/linux/hid.h     | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d0ed87d522e3..918f5fb4be21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3ca3839f344aa469e6f53c8bbb633e5ab9b96c8
+refs/heads/master: ce63920b395f1476e2d28cca16a56919289f0b62
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index ceade58b8027..48785db10e87 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -917,14 +917,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 
 	input = field->hidinput->input;
 
-#ifdef CONFIG_HID_BATTERY_STRENGTH
-	if (usage->hid == HID_DC_BATTERYSTRENGTH) {
-		hid->battery_val = value;
-		hid_dbg(hid, "battery value is %d (range %d-%d)\n",
-			value, hid->battery_min, hid->battery_max);
-		return;
-	}
-#endif
 	if (!usage->type)
 		return;
 
diff --git a/trunk/include/linux/hid.h b/trunk/include/linux/hid.h
index 9351d3d1d089..0e76f0ca110a 100644
--- a/trunk/include/linux/hid.h
+++ b/trunk/include/linux/hid.h
@@ -495,7 +495,6 @@ struct hid_device {							/* device report descriptor */
 	struct power_supply battery;
 	__s32 battery_min;
 	__s32 battery_max;
-	__s32 battery_val;
 	__s32 battery_report_type;
 	__s32 battery_report_id;
 #endif