diff options
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 08ec073444e..2e7ac31afa8 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -131,7 +131,7 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, | |||
131 | int direction, int idx, int mask, int val); | 131 | int direction, int idx, int mask, int val); |
132 | int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid, | 132 | int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid, |
133 | int dir, int idx, int mask, int val); | 133 | int dir, int idx, int mask, int val); |
134 | #ifdef SND_HDA_NEEDS_RESUME | 134 | #ifdef CONFIG_PM |
135 | void snd_hda_codec_resume_amp(struct hda_codec *codec); | 135 | void snd_hda_codec_resume_amp(struct hda_codec *codec); |
136 | #endif | 136 | #endif |
137 | 137 | ||
@@ -212,7 +212,9 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
212 | /* | 212 | /* |
213 | * SPDIF I/O | 213 | * SPDIF I/O |
214 | */ | 214 | */ |
215 | int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid); | 215 | int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, |
216 | hda_nid_t associated_nid, | ||
217 | hda_nid_t cvt_nid); | ||
216 | int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid); | 218 | int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid); |
217 | 219 | ||
218 | /* | 220 | /* |
@@ -563,7 +565,6 @@ int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key) | |||
563 | * power-management | 565 | * power-management |
564 | */ | 566 | */ |
565 | 567 | ||
566 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
567 | void snd_hda_schedule_power_save(struct hda_codec *codec); | 568 | void snd_hda_schedule_power_save(struct hda_codec *codec); |
568 | 569 | ||
569 | struct hda_amp_list { | 570 | struct hda_amp_list { |
@@ -580,7 +581,6 @@ struct hda_loopback_check { | |||
580 | int snd_hda_check_amp_list_power(struct hda_codec *codec, | 581 | int snd_hda_check_amp_list_power(struct hda_codec *codec, |
581 | struct hda_loopback_check *check, | 582 | struct hda_loopback_check *check, |
582 | hda_nid_t nid); | 583 | hda_nid_t nid); |
583 | #endif /* CONFIG_SND_HDA_POWER_SAVE */ | ||
584 | 584 | ||
585 | /* | 585 | /* |
586 | * AMP control callbacks | 586 | * AMP control callbacks |
@@ -639,8 +639,8 @@ struct hdmi_eld { | |||
639 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); | 639 | int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid); |
640 | int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t); | 640 | int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t); |
641 | void snd_hdmi_show_eld(struct hdmi_eld *eld); | 641 | void snd_hdmi_show_eld(struct hdmi_eld *eld); |
642 | void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm, | 642 | void snd_hdmi_eld_update_pcm_info(struct hdmi_eld *eld, |
643 | struct hda_pcm_stream *codec_pars); | 643 | struct hda_pcm_stream *hinfo); |
644 | 644 | ||
645 | #ifdef CONFIG_PROC_FS | 645 | #ifdef CONFIG_PROC_FS |
646 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, | 646 | int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, |