diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-11-02 03:54:51 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-11-16 05:14:04 -0500 |
commit | aad37dbd563010252e1bedb6dad6cddb867b9235 (patch) | |
tree | 4417a480e21dcd2f6bbbd6f6ff3b20fb10364f9b /sound/pci/hda/hda_jack.h | |
parent | 35be544af367170a9c6bf63adcf9d0cb2d569dbb (diff) |
ALSA: hda - Merge input-jack helpers to hda_jack.c
We can use the very same table in hda_jack.c for managing the list for
input-jack elements, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_jack.h')
-rw-r--r-- | sound/pci/hda/hda_jack.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h index 4bb75ee16b56..f8f97c71c9c1 100644 --- a/sound/pci/hda/hda_jack.h +++ b/sound/pci/hda/hda_jack.h | |||
@@ -22,6 +22,10 @@ struct hda_jack_tbl { | |||
22 | unsigned int jack_detect:1; /* capable of jack-detection? */ | 22 | unsigned int jack_detect:1; /* capable of jack-detection? */ |
23 | unsigned int jack_dirty:1; /* needs to update? */ | 23 | unsigned int jack_dirty:1; /* needs to update? */ |
24 | struct snd_kcontrol *kctl; /* assigned kctl for jack-detection */ | 24 | struct snd_kcontrol *kctl; /* assigned kctl for jack-detection */ |
25 | #ifdef CONFIG_SND_HDA_INPUT_JACK | ||
26 | int type; | ||
27 | struct snd_jack *jack; | ||
28 | #endif | ||
25 | }; | 29 | }; |
26 | 30 | ||
27 | struct hda_jack_tbl * | 31 | struct hda_jack_tbl * |