From 575894e47ec66788b6913300b294aaa45ea78885 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 16 Mar 2012 16:09:03 +0100
Subject: [PATCH] --- yaml --- r: 293126 b: refs/heads/master c:
 350eba43fca735733a51185f26bdc30899c64a20 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_sigmatel.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5852a95b2b6a..0d256f8aa901 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7907ae3e50613ae1c6d1a10f34fcd63f4123b93d
+refs/heads/master: 350eba43fca735733a51185f26bdc30899c64a20
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
index b064e595bb60..33a9946b492c 100644
--- a/trunk/sound/pci/hda/patch_sigmatel.c
+++ b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -5043,6 +5043,11 @@ static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,
 			afg_power_state);
 	snd_hda_codec_set_power_to_all(codec, fg, power_state, true);
 }
+#else
+#define stac92xx_suspend	NULL
+#define stac92xx_resume		NULL
+#define stac92xx_pre_resume	NULL
+#define stac92xx_set_power_state NULL
 #endif /* CONFIG_PM */
 
 /* update mute-LED accoring to the master switch */
@@ -5588,7 +5593,9 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
 			codec->patch_ops.set_power_state =
 					stac92xx_set_power_state;
 		}
+#ifdef CONFIG_PM
 		codec->patch_ops.pre_resume = stac92xx_pre_resume;
+#endif
 	}
 
 	err = stac92xx_parse_auto_config(codec);
@@ -5895,7 +5902,9 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 			codec->patch_ops.set_power_state =
 					stac92xx_set_power_state;
 		}
+#ifdef CONFIG_PM
 		codec->patch_ops.pre_resume = stac92xx_pre_resume;
+#endif
 	}
 
 	spec->multiout.dac_nids = spec->dac_nids;