---

yaml --- r: 353243 b: refs/heads/master c: 46a1448 h: refs/heads/master i: 353241: 3c462d4 353239: 28362ae v: v3
git-mirror · Feb 7, 2013 · b765f7a · b765f7a
1 parent 0b21c84
commit b765f7a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b57a895fa2188d4e1cefa030d0fc9d126e453a95
+refs/heads/master: 46a144818acd8b340bdc6ccf12255c7fb301f0ee
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -2483,7 +2483,6 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)
  * Parse input paths
  */
 
-#ifdef CONFIG_PM
 /* add the powersave loopback-list entry */
 static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx)
 {
@@ -2498,9 +2497,6 @@ static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx)
 	spec->num_loopbacks++;
 	spec->loopback.amplist = spec->loopback_list;
 }
-#else
-#define add_loopback_list(spec, mix, idx) /* NOP */
-#endif
 
 /* create input playback/capture controls for the given pin */
 static int new_analog_input(struct hda_codec *codec, int input_idx,

diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h
@@ -226,11 +226,10 @@ struct hda_gen_spec {
 	hda_nid_t vmaster_nid;
 	unsigned int vmaster_tlv[4];
 	struct hda_vmaster_mute_hook vmaster_mute;
-#ifdef CONFIG_PM
+
 	struct hda_loopback_check loopback;
 	int num_loopbacks;
 	struct hda_amp_list loopback_list[8];
-#endif
 
 	/* multi-io */
 	int multi_ios;