From 24544b2825230359505b705f904a8d5a0ce0ca11 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 20 Jun 2010 14:05:46 +0100
Subject: [PATCH] --- yaml --- r: 206563 b: refs/heads/master c:
 b45416656f55d880ab5a976be11bca720eff16c4 h: refs/heads/master i:   206561:
 9ed580870395232711c48f48583ddf636341d08f   206559:
 2a01e7341ad7c55ff465d91e30f9524d4b9b5522 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/codecs/Kconfig | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f51c2e1c6277..5fff23926f1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20630c7f5966419dd6a1f00b669a7771e228510a
+refs/heads/master: b45416656f55d880ab5a976be11bca720eff16c4
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index c37c84458b58..af81c28ba6f5 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -24,8 +24,8 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
 	select SND_SOC_CS42L51 if I2C
 	select SND_SOC_CS4270 if I2C
-	select SND_SOC_MAX9877 if I2C
 	select SND_SOC_DA7210 if I2C
+	select SND_SOC_MAX9877 if I2C
 	select SND_SOC_PCM3008
 	select SND_SOC_SPDIF
 	select SND_SOC_SSM2602 if I2C
@@ -128,9 +128,6 @@ config SND_SOC_CS42L51
 config SND_SOC_CS4270
 	tristate
 
-config SND_SOC_DA7210
-        tristate
-
 # Cirrus Logic CS4270 Codec VD = 3.3V Errata
 # Select if you are affected by the errata where the part will not function
 # if MCLK divide-by-1.5 is selected and VD is set to 3.3V.  The driver will
@@ -145,6 +142,9 @@ config SND_SOC_CX20442
 config SND_SOC_L3
        tristate
 
+config SND_SOC_DA7210
+        tristate
+
 config SND_SOC_PCM3008
        tristate