aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-06-20 08:43:20 -0400
committerTakashi Iwai <tiwai@suse.de>2012-06-20 08:43:20 -0400
commit1ade819181e9b4ab4de1ab0ac0b865d946fefc17 (patch)
tree9d724917503c0db204048ad68928f00be965e1c0 /sound/pci/hda/hda_codec.h
parentccfcf7d151c01969133b5555eed635537c41c944 (diff)
parentb4a91cf05c33d4ab5b2b3738a257a3fe49b462bd (diff)
Merge branch 'fix/hda' into topic/hda
The fix for power sequence needs to be merged back to topic branch.
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r--sound/pci/hda/hda_codec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 71864cddcb9d..a4ac1de7aa19 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -1059,10 +1059,12 @@ const char *snd_hda_get_jack_location(u32 cfg);
1059 */ 1059 */
1060#ifdef CONFIG_SND_HDA_POWER_SAVE 1060#ifdef CONFIG_SND_HDA_POWER_SAVE
1061void snd_hda_power_up(struct hda_codec *codec); 1061void snd_hda_power_up(struct hda_codec *codec);
1062void snd_hda_power_up_d3wait(struct hda_codec *codec);
1062void snd_hda_power_down(struct hda_codec *codec); 1063void snd_hda_power_down(struct hda_codec *codec);
1063void snd_hda_update_power_acct(struct hda_codec *codec); 1064void snd_hda_update_power_acct(struct hda_codec *codec);
1064#else 1065#else
1065static inline void snd_hda_power_up(struct hda_codec *codec) {} 1066static inline void snd_hda_power_up(struct hda_codec *codec) {}
1067static inline void snd_hda_power_up_d3wait(struct hda_codec *codec) {}
1066static inline void snd_hda_power_down(struct hda_codec *codec) {} 1068static inline void snd_hda_power_down(struct hda_codec *codec) {}
1067#endif 1069#endif
1068 1070