diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:28 +0100 |
| commit | a65056205cdf7efb96fb2558e4f1ec6bae2582ed (patch) | |
| tree | 22a5fa35464f26183e34aa4210fa6c145f24ddf3 /include | |
| parent | 313769d9edb1bbd59d2e94f5069950eecfe6fa44 (diff) | |
| parent | 7645c4bfbb36f357f03815f5729c46ce8d89f008 (diff) | |
| download | linux-a65056205cdf7efb96fb2558e4f1ec6bae2582ed.tar.bz2 | |
Merge branch 'topic/hda' into to-push
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input.h | 1 | ||||
| -rw-r--r-- | include/sound/jack.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 5341e8251f8c..1a958cd90ce9 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -659,6 +659,7 @@ struct input_absinfo { #define SW_RADIO SW_RFKILL_ALL /* deprecated */ #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ #define SW_DOCK 0x05 /* set = plugged into dock */ +#define SW_LINEOUT_INSERT 0x06 /* 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 b1b2b8b59adb..7cb25f4b50bb 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -35,6 +35,7 @@ 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, }; struct snd_jack { |