diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/serio.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/serio.h')
| -rw-r--r-- | include/linux/serio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index a640bc2afe76..e2f3044d4a4a 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
| @@ -215,5 +215,6 @@ static inline void serio_unpin_driver(struct serio *serio) | |||
| 215 | #define SERIO_INEXIO 0x37 | 215 | #define SERIO_INEXIO 0x37 |
| 216 | #define SERIO_TOUCHIT213 0x38 | 216 | #define SERIO_TOUCHIT213 0x38 |
| 217 | #define SERIO_W8001 0x39 | 217 | #define SERIO_W8001 0x39 |
| 218 | #define SERIO_DYNAPRO 0x3a | ||
| 218 | 219 | ||
| 219 | #endif | 220 | #endif |