From 2ae4625851acb51aeadb72b55fccd9c1ebeb142b Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 28 Dec 2010 02:14:25 +0000
Subject: [PATCH] --- yaml --- r: 230451 b: refs/heads/master c:
 6dc47e97a064c4fc0e324fc4accc90415c1509b2 h: refs/heads/master i:   230449:
 433546aafb8a1c8984129f46b98d829a2a72ad74   230447:
 9d0edf26bcbccbc6a562cf1c1c9b8f5b55b115c4 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8962.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 735e939fc029..990b200c3387 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a164612eb6562d211e7fc67890df42753da7dfa0
+refs/heads/master: 6dc47e97a064c4fc0e324fc4accc90415c1509b2
diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c
index e2177144b714..aa1192f6aa9c 100644
--- a/trunk/sound/soc/codecs/wm8962.c
+++ b/trunk/sound/soc/codecs/wm8962.c
@@ -3354,7 +3354,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
 	if (active & (WM8962_MICSCD_EINT | WM8962_MICD_EINT)) {
 		dev_dbg(codec->dev, "Microphone event detected\n");
 
-#ifndef CONFIG_SOUND_SOC_WM8962_MODULE
+#ifndef CONFIG_SND_SOC_WM8962_MODULE
 		trace_snd_soc_jack_irq(dev_name(codec->dev));
 #endif