From 457a48488b1b543480574b22151cb6b1964f3d18 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 28 Jun 2011 16:50:39 +1000
Subject: [PATCH] --- yaml --- r: 257717 b: refs/heads/master c:
 880a050f4ac4399c9da4aea3ca19a701f9a727e0 h: refs/heads/master i:   257715:
 c9681a8c7792fe60fabd9d85e815a5abc353f379 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_local.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ecf735437d15..5fc7b77fed3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f574b7b1a1cc8aac617e938459e8f03a641e678
+refs/heads/master: 880a050f4ac4399c9da4aea3ca19a701f9a727e0
diff --git a/trunk/sound/pci/hda/hda_local.h b/trunk/sound/pci/hda/hda_local.h
index b333bf46a19c..88b277e97409 100644
--- a/trunk/sound/pci/hda/hda_local.h
+++ b/trunk/sound/pci/hda/hda_local.h
@@ -565,7 +565,6 @@ int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)
  * power-management
  */
 
-#ifdef CONFIG_SND_HDA_POWER_SAVE
 void snd_hda_schedule_power_save(struct hda_codec *codec);
 
 struct hda_amp_list {
@@ -582,7 +581,6 @@ struct hda_loopback_check {
 int snd_hda_check_amp_list_power(struct hda_codec *codec,
 				 struct hda_loopback_check *check,
 				 hda_nid_t nid);
-#endif /* CONFIG_SND_HDA_POWER_SAVE */
 
 /*
  * AMP control callbacks