net: Avoid extra wakeups of threads blocked in wait_for_packet()

[safe/jmp/linux-2.6] / include / sound / jack.h

diff --git a/include/sound/jack.h b/include/sound/jack.h
index b1b2b8b..6b013c6 100644 (file)
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -30,11 +30,18 @@ struct input_dev;
 /**
  * Jack types which can be reported.  These values are used as a
  * bitmask.
+ *
+ * Note that this must be kept in sync with the lookup table in
+ * sound/core/jack.c.
  */
 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 */
+       SND_JACK_VIDEOOUT       = 0x0010,
+       SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
 };
 
 struct snd_jack {