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;