diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
commit | eed4bafd63b5584adb832a582a931ecba41dec55 (patch) | |
tree | 5855807caaf53aec80037b2635eb2e2c0744565b /include/linux/hid.h | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
parent | 2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff) |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r-- | include/linux/hid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 0c48991b040..8136c6d9903 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -647,8 +647,8 @@ struct hid_driver { int (*input_mapped)(struct hid_device *hdev, struct hid_input *hidinput, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max); - void (*input_configured)(struct hid_device *hdev, - struct hid_input *hidinput); + int (*input_configured)(struct hid_device *hdev, + struct hid_input *hidinput); void (*feature_mapping)(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage); |