mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-15 20:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'topic/hda' into to-push

Browse Source
This commit is contained in:
Takashi Iwai
2008-12-25 11:40:28 +01:00
parent 313769d9ed 7645c4bfbb
commit a65056205c
30 changed files with 5773 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/input.h
View File

@@ -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)

1
include/sound/jack.h
View File

@@ -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 {