From b765f7a28b269575daba5631457591b6c6f7b588 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 7 Feb 2013 09:58:11 +0100
Subject: [PATCH] --- yaml --- r: 353243 b: refs/heads/master c:
 46a144818acd8b340bdc6ccf12255c7fb301f0ee h: refs/heads/master i:   353241:
 3c462d40ea1a7b0170923728f6336be71ca2d869   353239:
 28362ae3913a6a8b2b9e923b8a138f337a138fdf v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/hda/hda_generic.c | 4 ----
 trunk/sound/pci/hda/hda_generic.h | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 34edbcc99132..cf178dacfc14 100644
--- 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
index c4ba3066a013..c2cd3d6b6003 100644
--- 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
index 065fcc77b860..d5348dd7a14f 100644
--- 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;