ALSA: ASoC: Sort Kconfig and Makefile entries for codecs

Hopefully this will make merges a little bit easier.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 32 insertions, 32 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 8b4bb5c5af26..27f2dfa7ca1a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -4,7 +4,10 @@ config SND_SOC_ALL_CODECS
         select SPI
         select SPI_MASTER
         select SND_SOC_AK4535
+        select SND_SOC_CS4270
         select SND_SOC_SSM2602
+        select SND_SOC_TLV320AIC26
+        select SND_SOC_TLV320AIC3X
         select SND_SOC_UDA1380
         select SND_SOC_WM8510
         select SND_SOC_WM8580
@@ -14,9 +17,6 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_WM8900
         select SND_SOC_WM8903
         select SND_SOC_WM8990
-        select SND_SOC_CS4270
-        select SND_SOC_TLV320AIC26
-        select SND_SOC_TLV320AIC3X
         help
           Normally ASoC codec drivers are only built if a machine driver which
           uses them is also built since they are only usable with a machine
@@ -36,6 +36,35 @@ config SND_SOC_AD1980
 config SND_SOC_AK4535
         tristate
 
+# Cirrus Logic CS4270 Codec
+config SND_SOC_CS4270
+        tristate
+
+# Cirrus Logic CS4270 Codec Hardware Mute Support
+# Select if you have external muting circuitry attached to your CS4270.
+config SND_SOC_CS4270_HWMUTE
+        bool
+        depends on SND_SOC_CS4270
+
+# 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
+# not select any sample rates that require MCLK to be divided by 1.5.
+config SND_SOC_CS4270_VD33_ERRATA
+        bool
+        depends on SND_SOC_CS4270
+
+config SND_SOC_SSM2602
+        tristate
+
+config SND_SOC_TLV320AIC26
+        tristate "TI TLV320AIC26 Codec support"
+        depends on SND_SOC && SPI
+
+config SND_SOC_TLV320AIC3X
+        tristate
+        depends on I2C
+
 config SND_SOC_UDA1380
         tristate
 
@@ -68,32 +97,3 @@ config SND_SOC_WM9712
 
 config SND_SOC_WM9713
         tristate
-
-# Cirrus Logic CS4270 Codec
-config SND_SOC_CS4270
-        tristate
-
-# Cirrus Logic CS4270 Codec Hardware Mute Support
-# Select if you have external muting circuitry attached to your CS4270.
-config SND_SOC_CS4270_HWMUTE
-        bool
-        depends on SND_SOC_CS4270
-
-# 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
-# not select any sample rates that require MCLK to be divided by 1.5.
-config SND_SOC_CS4270_VD33_ERRATA
-        bool
-        depends on SND_SOC_CS4270
-
-config SND_SOC_TLV320AIC26
-        tristate "TI TLV320AIC26 Codec support"
-        depends on SND_SOC && SPI
-
-config SND_SOC_TLV320AIC3X
-        tristate
-        depends on I2C
-
-config SND_SOC_SSM2602
-        tristate