diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 13:57:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-04 13:57:42 -0500 |
| commit | 31c150a11c867da233a7b5e13b45bcbd3a796bde (patch) | |
| tree | 58202fc8e93833f3ea3e52f9cb0093e61265d73d /include | |
| parent | 4554c135a0a017f4cd96f7c0612cb7ca78c68d08 (diff) | |
| parent | 82b982c9a697e7be0745523a53334fe38a4582c8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist
Input: serio_raw - return proper result when serio_raw_read fails
Input: document device properties
Input: twl4030_keypad - fix comment (trivial)
Input: gpio_keys - fix struct device declared inside parameter list
Input: evdev - fix variable initialisation
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio_keys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h index b5ca4b2c08ec..004ff33ab38e 100644 --- a/include/linux/gpio_keys.h +++ b/include/linux/gpio_keys.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _GPIO_KEYS_H | 1 | #ifndef _GPIO_KEYS_H |
| 2 | #define _GPIO_KEYS_H | 2 | #define _GPIO_KEYS_H |
| 3 | 3 | ||
| 4 | struct device; | ||
| 5 | |||
| 4 | struct gpio_keys_button { | 6 | struct gpio_keys_button { |
| 5 | /* Configuration parameters */ | 7 | /* Configuration parameters */ |
| 6 | unsigned int code; /* input event code (KEY_*, SW_*) */ | 8 | unsigned int code; /* input event code (KEY_*, SW_*) */ |