summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-15 15:53:44 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:37 +0200
commitad7d422758cd6c53f763cbf63bb3f062ee5da68f (patch)
treefd5925cfe46c57843b889646a8f23897caed27d6
parent5d743cf3f0497998a9ba5e3762df7d9ef287a303 (diff)
cg2900: sound: fixes due to move cg29xx driver in staging
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--sound/soc/codecs/cg29xx.c2
-rw-r--r--sound/soc/codecs/cg29xx.h2
-rw-r--r--sound/soc/ux500/Kconfig2
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c
index 41d8b11c2db..1ee3f3c38af 100644
--- a/sound/soc/codecs/cg29xx.c
+++ b/sound/soc/codecs/cg29xx.c
@@ -25,7 +25,7 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <linux/bitops.h>
-#include <linux/mfd/cg2900_audio.h>
+#include <../../../drivers/staging/cg2900/include/cg2900_audio.h>
#include "cg29xx.h"
diff --git a/sound/soc/codecs/cg29xx.h b/sound/soc/codecs/cg29xx.h
index 5e73bc4b65a..fec52d7cdd7 100644
--- a/sound/soc/codecs/cg29xx.h
+++ b/sound/soc/codecs/cg29xx.h
@@ -13,7 +13,7 @@
#ifndef CG29XX_CODEC_H
#define CG29XX_CODEC_H
-#include <linux/mfd/cg2900_audio.h>
+#include <../../../drivers/staging/cg2900/include/cg2900_audio.h>
struct cg29xx_codec_dai_data {
struct mutex mutex;
diff --git a/sound/soc/ux500/Kconfig b/sound/soc/ux500/Kconfig
index 9463ff264fd..02239929879 100644
--- a/sound/soc/ux500/Kconfig
+++ b/sound/soc/ux500/Kconfig
@@ -35,7 +35,7 @@ config SND_SOC_UX500_AB8500
config SND_SOC_UX500_CG29XX
bool "Codec - CG29xx"
- depends on SND_SOC_UX500 && (UX500_SOC_DB8500 || UX500_SOC_DB5500) && MFD_CG2900_AUDIO
+ depends on SND_SOC_UX500 && (UX500_SOC_DB8500 || UX500_SOC_DB5500) && CG2900_AUDIO
select SND_SOC_CG29XX
default n
help