---

yaml --- r: 282319 b: refs/heads/master c: 6720079 h: refs/heads/master i: 282317: ae4b8dd 282315: 4203e94 282311: f9db2de 282303: f17bf01 v: v3
git-mirror · Nov 30, 2011 · db4a9aa · db4a9aa
1 parent 8fa306f
commit db4a9aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;