diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
| commit | 8ed575904373d7aaab7f15a8db2edc317a44df43 (patch) | |
| tree | 3b2e92a396a1bbec8e1fb499f25e8aed93ab5692 /include/linux/input.h | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| parent | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (diff) | |
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index e8c296ff6257..d7836311ada9 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -644,6 +644,7 @@ struct input_absinfo { | |||
| 644 | #define BUS_ADB 0x17 | 644 | #define BUS_ADB 0x17 |
| 645 | #define BUS_I2C 0x18 | 645 | #define BUS_I2C 0x18 |
| 646 | #define BUS_HOST 0x19 | 646 | #define BUS_HOST 0x19 |
| 647 | #define BUS_GSC 0x1A | ||
| 647 | 648 | ||
| 648 | /* | 649 | /* |
| 649 | * Values describing the status of an effect | 650 | * Values describing the status of an effect |