diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
| commit | 20530516281e94d873ce9ebf7f7365ed241cf9a6 (patch) | |
| tree | 23fa46e3808b38551114cd0c2ab7051e3d2419e4 /include | |
| parent | fbda7f6f2981a3e8972f9c8c38d7ef291d8c1eb9 (diff) | |
| parent | a2d781fc8d9b16113dd9440107d73c0f21d7cbef (diff) | |
Merge commit 'input/next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio_keys.h | 1 | ||||
| -rw-r--r-- | include/linux/libps2.h | 2 | ||||
| -rw-r--r-- | include/linux/serio.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h index ec6ecd74781d..1289fa7623ca 100644 --- a/include/linux/gpio_keys.h +++ b/include/linux/gpio_keys.h @@ -15,6 +15,7 @@ struct gpio_keys_button { struct gpio_keys_platform_data { struct gpio_keys_button *buttons; int nbuttons; + unsigned int rep:1; /* enable input subsystem auto repeat */ }; #endif diff --git a/include/linux/libps2.h b/include/linux/libps2.h index afc413369101..b94534b7e266 100644 --- a/include/linux/libps2.h +++ b/include/linux/libps2.h @@ -18,11 +18,13 @@ #define PS2_RET_ID 0x00 #define PS2_RET_ACK 0xfa #define PS2_RET_NAK 0xfe +#define PS2_RET_ERR 0xfc #define PS2_FLAG_ACK 1 /* Waiting for ACK/NAK */ #define PS2_FLAG_CMD 2 /* Waiting for command to finish */ #define PS2_FLAG_CMD1 4 /* Waiting for the first byte of command response */ #define PS2_FLAG_WAITID 8 /* Command execiting is GET ID */ +#define PS2_FLAG_NAK 16 /* Last transmission was NAKed */ struct ps2dev { struct serio *serio; diff --git a/include/linux/serio.h b/include/linux/serio.h index 25641d9e0ea8..1bcb357a01a1 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h @@ -213,5 +213,6 @@ static inline void serio_unpin_driver(struct serio *serio) #define SERIO_ZHENHUA 0x36 #define SERIO_INEXIO 0x37 #define SERIO_TOUCHIT213 0x37 +#define SERIO_W8001 0x39 #endif |