From f4023b5326cc4ca583662a0355626d4b68535283 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Fri, 9 Mar 2012 10:26:03 +0200
Subject: [PATCH] --- yaml --- r: 293487 b: refs/heads/master c:
 d0f47ff17f29740eabbd64e11705b7332241714c h: refs/heads/master i:   293485:
 539525e27d7c523efebf861516835becc1e30381   293483:
 4c3da9c3be320f7abfc192b94738f0c5f8a720f6   293479:
 f514beab2fb9f5422f4208d506b5630f003b04ab   293471:
 ac85b543272f803ca5ccc6dba6bcb4c8fef39751 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/omap/Kconfig  | 6 ------
 trunk/sound/soc/omap/Makefile | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e1cc7f131a95..d5be909817e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ead4679e579560f4b5370e4a2f4c00ae4f1988b
+refs/heads/master: d0f47ff17f29740eabbd64e11705b7332241714c
diff --git a/trunk/sound/soc/omap/Kconfig b/trunk/sound/soc/omap/Kconfig
index 27a3a29f7cd3..e00dd0b1139c 100644
--- a/trunk/sound/soc/omap/Kconfig
+++ b/trunk/sound/soc/omap/Kconfig
@@ -5,13 +5,8 @@ config SND_OMAP_SOC
 config SND_OMAP_SOC_DMIC
 	tristate
 
-config OMAP_MCBSP
-	tristate
-	depends on ARCH_OMAP
-
 config SND_OMAP_SOC_MCBSP
 	tristate
-	select OMAP_MCBSP
 
 config SND_OMAP_SOC_MCPDM
 	tristate
@@ -31,7 +26,6 @@ config SND_OMAP_SOC_N810
 config SND_OMAP_SOC_RX51
 	tristate "SoC Audio support for Nokia RX-51"
 	depends on SND_OMAP_SOC && MACH_NOKIA_RX51
-	select OMAP_MCBSP
 	select SND_OMAP_SOC_MCBSP
 	select SND_SOC_TLV320AIC3X
 	select SND_SOC_TPA6130A2
diff --git a/trunk/sound/soc/omap/Makefile b/trunk/sound/soc/omap/Makefile
index 9f8fbd554eb6..1d656bce01d4 100644
--- a/trunk/sound/soc/omap/Makefile
+++ b/trunk/sound/soc/omap/Makefile
@@ -1,13 +1,12 @@
 # OMAP Platform Support
 snd-soc-omap-objs := omap-pcm.o
 snd-soc-omap-dmic-objs := omap-dmic.o
-snd-soc-omap-mcbsp-objs := omap-mcbsp.o
+snd-soc-omap-mcbsp-objs := omap-mcbsp.o mcbsp.o
 snd-soc-omap-mcpdm-objs := omap-mcpdm.o
 snd-soc-omap-hdmi-objs := omap-hdmi.o
 
 obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o
 obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o
-obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
 obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o
 obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o