From db4a9aac19a8f06966fc1265780e65c6a68b9934 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Nov 2011 14:42:04 +0100
Subject: [PATCH] --- yaml --- r: 282319 b: refs/heads/master c:
 672007957846c3d556165bab635a9c9b855261fa h: refs/heads/master i:   282317:
 ae4b8dd38c5e1b7988f3d6d320ecb68d76615cb2   282315:
 4203e94b1b8d4762991cf05aa87727a4fc5d7d68   282311:
 f9db2ded6350444033ee3f5164b919348f9d1217   282303:
 f17bf0163188ea3b0293129020cd6f7a873141fb v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6a7dadba481a..590a81e2a092 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f5ca836bef3dd3eb602152d5d712a513998264e
+refs/heads/master: 672007957846c3d556165bab635a9c9b855261fa
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index 2d96b782b203..b9b8c75a6f9a 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -861,13 +861,14 @@ 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;