diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /include/linux/input.h | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
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 7ed2251b33f1..83524e4f3290 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -806,6 +806,7 @@ struct input_absinfo { | |||
| 806 | #define BUS_HOST 0x19 | 806 | #define BUS_HOST 0x19 |
| 807 | #define BUS_GSC 0x1A | 807 | #define BUS_GSC 0x1A |
| 808 | #define BUS_ATARI 0x1B | 808 | #define BUS_ATARI 0x1B |
| 809 | #define BUS_SPI 0x1C | ||
| 809 | 810 | ||
| 810 | /* | 811 | /* |
| 811 | * MT_TOOL types | 812 | * MT_TOOL types |