Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / include / sound / jack.h

diff --git a/include/sound/jack.h b/include/sound/jack.h
index b1b2b8b59adbe67d7efb817b09f7b985ad0422e7..2e0315cdd0d6780636d25dce4304dba14702238c 100644 (file)
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -35,6 +35,8 @@ enum snd_jack_types {
        SND_JACK_HEADPHONE      = 0x0001,
        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 {