summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2011-10-05 17:53:25 +0400
committerTakashi Iwai <tiwai@suse.de>2011-10-05 19:22:04 +0400
commit7c2f8e4009d4b66c8458e3a5c20510b4262853bb (patch)
tree5958ddebda59e7822890f66275787d134fa1543b /include
parent48718eab5a719cb537466124d9585b3066e27fae (diff)
downloadlinux-7c2f8e4009d4b66c8458e3a5c20510b4262853bb.tar.xz
ALSA: jack - Add "Line In" input jack constants
Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 a637e7814334..a514fb8faea3 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -814,6 +814,7 @@ struct input_keymap_entry {
#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */
#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)
diff --git a/include/sound/jack.h b/include/sound/jack.h
index c140fc7cbd3f..63c790742db4 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -42,6 +42,7 @@ enum snd_jack_types {
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
SND_JACK_VIDEOOUT = 0x0010,
SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+ SND_JACK_LINEIN = 0x0020,
/* Kept separate from switches to facilitate implementation */
SND_JACK_BTN_0 = 0x4000,