diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-14 03:16:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-14 03:16:49 -0500 |
| commit | cc0104e877fff32865a67b256d3a9ce52ff15790 (patch) | |
| tree | 18779442274e81607822ecb0905c55ac4ce6a163 /include/linux/serio.h | |
| parent | 16620e0f1990fa6d896a639449c4b3d678458464 (diff) | |
| parent | f40542532e96dda5506eb76badea322f2ae4731c (diff) | |
Merge branch 'linus' into tracing/urgent
Conflicts:
kernel/trace/trace_kprobe.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 a640bc2afe7..e2f3044d4a4 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 |