diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:14:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:14:01 -0500 |
commit | db30c70575822cc84d87b5613c19cac24734b99f (patch) | |
tree | 82945ad5813bfe6633698233981d270b5f0a310b /include/linux | |
parent | c861ea2cb2c25c1698734d9b0540a09e253690a1 (diff) | |
parent | 9334e90d5ac5ee1fa6d8b75acb7c64a8907787d1 (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: (29 commits)
Input: i8042 - add Dell Vostro 1510 to nomux list
Input: gtco - use USB endpoint API
Input: add support for Maple controller as a joystick
Input: atkbd - broaden the Dell DMI signatures
Input: HIL drivers - add MODULE_ALIAS()
Input: map_to_7segment.h - convert to __inline__ for userspace
Input: add support for enhanced rotary controller on pxa930 and pxa935
Input: add support for trackball on pxa930 and pxa935
Input: add da9034 touchscreen support
Input: ads7846 - strict_strtoul takes unsigned long
Input: make some variables and functions static
Input: add tsc2007 based touchscreen driver
Input: psmouse - add module parameters to control OLPC touchpad delays
Input: i8042 - add Gigabyte M912 netbook to noloop exception table
Input: atkbd - Samsung NC10 key repeat fix
Input: atkbd - add keyboard quirk for HP Pavilion ZV6100 laptop
Input: libps2 - handle 0xfc responses from devices
Input: add support for Wacom W8001 penabled serial touchscreen
Input: synaptics - report multi-taps only if supported by the device
Input: add joystick driver for Walkera WK-0701 RC transmitter
...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/gpio_keys.h | 1 | ||||
-rw-r--r-- | include/linux/i2c/tsc2007.h | 17 | ||||
-rw-r--r-- | include/linux/libps2.h | 2 | ||||
-rw-r--r-- | include/linux/map_to_7segment.h | 2 | ||||
-rw-r--r-- | include/linux/serio.h | 1 |
5 files changed, 22 insertions, 1 deletions
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h index ec6ecd74781..1289fa7623c 100644 --- a/include/linux/gpio_keys.h +++ b/include/linux/gpio_keys.h | |||
@@ -15,6 +15,7 @@ struct gpio_keys_button { | |||
15 | struct gpio_keys_platform_data { | 15 | struct gpio_keys_platform_data { |
16 | struct gpio_keys_button *buttons; | 16 | struct gpio_keys_button *buttons; |
17 | int nbuttons; | 17 | int nbuttons; |
18 | unsigned int rep:1; /* enable input subsystem auto repeat */ | ||
18 | }; | 19 | }; |
19 | 20 | ||
20 | #endif | 21 | #endif |
diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h new file mode 100644 index 00000000000..c6361fbb7bf --- /dev/null +++ b/include/linux/i2c/tsc2007.h | |||
@@ -0,0 +1,17 @@ | |||
1 | #ifndef __LINUX_I2C_TSC2007_H | ||
2 | #define __LINUX_I2C_TSC2007_H | ||
3 | |||
4 | /* linux/i2c/tsc2007.h */ | ||
5 | |||
6 | struct tsc2007_platform_data { | ||
7 | u16 model; /* 2007. */ | ||
8 | u16 x_plate_ohms; | ||
9 | |||
10 | int (*get_pendown_state)(void); | ||
11 | void (*clear_penirq)(void); /* If needed, clear 2nd level | ||
12 | interrupt source */ | ||
13 | int (*init_platform_hw)(void); | ||
14 | void (*exit_platform_hw)(void); | ||
15 | }; | ||
16 | |||
17 | #endif | ||
diff --git a/include/linux/libps2.h b/include/linux/libps2.h index afc41336910..b94534b7e26 100644 --- a/include/linux/libps2.h +++ b/include/linux/libps2.h | |||
@@ -18,11 +18,13 @@ | |||
18 | #define PS2_RET_ID 0x00 | 18 | #define PS2_RET_ID 0x00 |
19 | #define PS2_RET_ACK 0xfa | 19 | #define PS2_RET_ACK 0xfa |
20 | #define PS2_RET_NAK 0xfe | 20 | #define PS2_RET_NAK 0xfe |
21 | #define PS2_RET_ERR 0xfc | ||
21 | 22 | ||
22 | #define PS2_FLAG_ACK 1 /* Waiting for ACK/NAK */ | 23 | #define PS2_FLAG_ACK 1 /* Waiting for ACK/NAK */ |
23 | #define PS2_FLAG_CMD 2 /* Waiting for command to finish */ | 24 | #define PS2_FLAG_CMD 2 /* Waiting for command to finish */ |
24 | #define PS2_FLAG_CMD1 4 /* Waiting for the first byte of command response */ | 25 | #define PS2_FLAG_CMD1 4 /* Waiting for the first byte of command response */ |
25 | #define PS2_FLAG_WAITID 8 /* Command execiting is GET ID */ | 26 | #define PS2_FLAG_WAITID 8 /* Command execiting is GET ID */ |
27 | #define PS2_FLAG_NAK 16 /* Last transmission was NAKed */ | ||
26 | 28 | ||
27 | struct ps2dev { | 29 | struct ps2dev { |
28 | struct serio *serio; | 30 | struct serio *serio; |
diff --git a/include/linux/map_to_7segment.h b/include/linux/map_to_7segment.h index 7df8432c440..12d62a54d47 100644 --- a/include/linux/map_to_7segment.h +++ b/include/linux/map_to_7segment.h | |||
@@ -75,7 +75,7 @@ struct seg7_conversion_map { | |||
75 | unsigned char table[128]; | 75 | unsigned char table[128]; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static inline int map_to_seg7(struct seg7_conversion_map *map, int c) | 78 | static __inline__ int map_to_seg7(struct seg7_conversion_map *map, int c) |
79 | { | 79 | { |
80 | return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL; | 80 | return c >= 0 && c < sizeof(map->table) ? map->table[c] : -EINVAL; |
81 | } | 81 | } |
diff --git a/include/linux/serio.h b/include/linux/serio.h index 25641d9e0ea..1bcb357a01a 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
@@ -213,5 +213,6 @@ static inline void serio_unpin_driver(struct serio *serio) | |||
213 | #define SERIO_ZHENHUA 0x36 | 213 | #define SERIO_ZHENHUA 0x36 |
214 | #define SERIO_INEXIO 0x37 | 214 | #define SERIO_INEXIO 0x37 |
215 | #define SERIO_TOUCHIT213 0x37 | 215 | #define SERIO_TOUCHIT213 0x37 |
216 | #define SERIO_W8001 0x39 | ||
216 | 217 | ||
217 | #endif | 218 | #endif |