summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:29 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:29 +0100
commita8022697811c3f2271df5ec14fa6f518b731b46a (patch)
treed94522dec3c3008d6e204ac5266888d5997b2368 /include
parenta65056205cdf7efb96fb2558e4f1ec6bae2582ed (diff)
parentcdc693643271b2e6a693cf8f6afb258cce01f058 (diff)
downloadop-kernel-dev-a8022697811c3f2271df5ec14fa6f518b731b46a.zip
op-kernel-dev-a8022697811c3f2271df5ec14fa6f518b731b46a.tar.gz
Merge branch 'topic/jack-mechanical' into to-push
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h1
-rw-r--r--include/sound/jack.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 1a958cd..9a6355f 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -660,6 +660,7 @@ struct input_absinfo {
#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */
#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_MAX 0x0f
#define SW_CNT (SW_MAX+1)
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 7cb25f4..2e0315c 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -36,6 +36,7 @@ enum snd_jack_types {
SND_JACK_MICROPHONE = 0x0002,
SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
SND_JACK_LINEOUT = 0x0004,
+ SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
};
struct snd_jack {
OpenPOWER on IntegriCloud