From 2594b8f2afe4c97d3fd1da4a81a124a52d436553 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Tue, 30 Aug 2011 14:39:54 +0300
Subject: [PATCH] --- yaml --- r: 270628 b: refs/heads/master c:
 0722d055ac2236da4e319d22a99c9f7e82dbdd5d h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-omap2/board-rx51-peripherals.c | 1 -
 trunk/include/sound/tpa6130a2-plat.h               | 6 ------
 trunk/sound/soc/codecs/tpa6130a2.c                 | 5 +++++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 39e4ccbc9708..1feba8b67276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07441006b2a1df0478bb7bdafd9dcd578898f2d4
+refs/heads/master: 0722d055ac2236da4e319d22a99c9f7e82dbdd5d
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
index 5a886cd2c598..ba1aa07bdb29 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -900,7 +900,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
 };
 
 static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = {
-	.id			= TPA6130A2,
 	.power_gpio		= 98,
 };
 
diff --git a/trunk/include/sound/tpa6130a2-plat.h b/trunk/include/sound/tpa6130a2-plat.h
index 89beccb57edd..4cc1093844c8 100644
--- a/trunk/include/sound/tpa6130a2-plat.h
+++ b/trunk/include/sound/tpa6130a2-plat.h
@@ -23,13 +23,7 @@
 #ifndef TPA6130A2_PLAT_H
 #define TPA6130A2_PLAT_H
 
-enum tpa_model {
-	TPA6130A2,
-	TPA6140A2,
-};
-
 struct tpa6130a2_platform_data {
-	enum tpa_model id;
 	int power_gpio;
 };
 
diff --git a/trunk/sound/soc/codecs/tpa6130a2.c b/trunk/sound/soc/codecs/tpa6130a2.c
index a14689be700a..7eeca79d7387 100644
--- a/trunk/sound/soc/codecs/tpa6130a2.c
+++ b/trunk/sound/soc/codecs/tpa6130a2.c
@@ -33,6 +33,11 @@
 
 #include "tpa6130a2.h"
 
+enum tpa_model {
+	TPA6130A2,
+	TPA6140A2,
+};
+
 static struct i2c_client *tpa6130a2_client;
 
 /* This struct is used to save the context */