diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-04 06:09:35 +0100 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-04 06:09:35 +0100 |
| commit | 251f39fe42dae863bd24e30864e6b66076ba076d (patch) | |
| tree | c804944bc17f3836d19cc8b5bc611dd1fb0ea915 /include/sound/jack.h | |
| parent | power_supply: Add "unknown" in power supply type (diff) | |
| parent | power_supply: add "powers" links to self-powered HID devices (diff) | |
| download | linux-251f39fe42dae863bd24e30864e6b66076ba076d.tar.xz linux-251f39fe42dae863bd24e30864e6b66076ba076d.zip | |
Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
Diffstat (limited to 'include/sound/jack.h')
| -rw-r--r-- | include/sound/jack.h | 1 |
1 files changed, 1 insertions, 0 deletions
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, |