aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-02 08:54:51 +0100
committerTakashi Iwai <tiwai@suse.de>2011-11-16 11:14:04 +0100
commitaad37dbd563010252e1bedb6dad6cddb867b9235 (patch)
tree4417a480e21dcd2f6bbbd6f6ff3b20fb10364f9b /sound/pci/hda/hda_local.h
parentALSA: Introduce common helper functions for jack-detection control (diff)
downloadlinux-dev-aad37dbd563010252e1bedb6dad6cddb867b9235.tar.xz
linux-dev-aad37dbd563010252e1bedb6dad6cddb867b9235.zip
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_local.h')
-rw-r--r--sound/pci/hda/hda_local.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 08e88b826d27..13f681480a38 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -680,7 +680,6 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
int snd_hda_input_jack_add(struct hda_codec *codec, hda_nid_t nid, int type,
const char *name);
void snd_hda_input_jack_report(struct hda_codec *codec, hda_nid_t nid);
-void snd_hda_input_jack_free(struct hda_codec *codec);
#else /* CONFIG_SND_HDA_INPUT_JACK */
static inline int snd_hda_input_jack_add(struct hda_codec *codec,
hda_nid_t nid, int type,
@@ -692,9 +691,6 @@ static inline void snd_hda_input_jack_report(struct hda_codec *codec,
hda_nid_t nid)
{
}
-static inline void snd_hda_input_jack_free(struct hda_codec *codec)
-{
-}
#endif /* CONFIG_SND_HDA_INPUT_JACK */
#endif /* __SOUND_HDA_LOCAL_H */