diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-01-09 05:24:59 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-01-09 05:24:59 -0500 |
| commit | 420174afdc7023c000e5b5b1b6fe9e028470c713 (patch) | |
| tree | a50385761d11bef88689c53317d52f431bab3f9a /drivers/hid/hid-core.c | |
| parent | e0273728564a395a13cfed70e34da4f2613d2d44 (diff) | |
| parent | 652aa6a9ac4a5f8d3e1fa3f6466646519e83c01e (diff) | |
Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b88ae113d367..af08ce7207d9 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1159,7 +1159,7 @@ static bool hid_match_one_id(struct hid_device *hdev, | |||
| 1159 | (id->product == HID_ANY_ID || id->product == hdev->product); | 1159 | (id->product == HID_ANY_ID || id->product == hdev->product); |
| 1160 | } | 1160 | } |
| 1161 | 1161 | ||
| 1162 | static const struct hid_device_id *hid_match_id(struct hid_device *hdev, | 1162 | const struct hid_device_id *hid_match_id(struct hid_device *hdev, |
| 1163 | const struct hid_device_id *id) | 1163 | const struct hid_device_id *id) |
| 1164 | { | 1164 | { |
| 1165 | for (; id->bus; id++) | 1165 | for (; id->bus; id++) |