diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
commit | 5b56eec77498f15317f3ff5ac9101372f400c859 (patch) | |
tree | 1acfb40ca6a19323a292131aa7fca68ef4ef330b /include/linux/input.h | |
parent | c2f43981e5dbc92884149aa2234064cc2c340acd (diff) | |
parent | 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff) | |
download | op-kernel-dev-5b56eec77498f15317f3ff5ac9101372f400c859.zip op-kernel-dev-5b56eec77498f15317f3ff5ac9101372f400c859.tar.gz |
Merge branch 'topic/jack' into for-linus
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 1249a0c..6b28048 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -661,6 +661,7 @@ struct input_absinfo { #define SW_DOCK 0x05 /* set = plugged into dock */ #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ #define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ +#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ #define SW_MAX 0x0f #define SW_CNT (SW_MAX+1) |