ASoC: hdac: Fix Makefile and Kconfig sorting

Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 5c584dad0af0155396b5577ca758b410bb783b34..8bba374b8860c8adb639e6e7ae08d88d930eb3c7 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -66,8 +66,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
-       select SND_SOC_ICS43432
        select SND_SOC_HDAC_HDMI
+       select SND_SOC_ICS43432
        select SND_SOC_ISABELLE if I2C
        select SND_SOC_JZ4740_CODEC
        select SND_SOC_LM4857 if I2C
@@ -455,11 +455,6 @@ config SND_SOC_BT_SCO
 config SND_SOC_DMIC
        tristate
 
-config SND_SOC_HDAC_HDMI
-       tristate
-       select SND_HDA_EXT_CORE
-       select HDMI
-
 config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
 
@@ -474,6 +469,11 @@ config SND_SOC_ES8328_SPI
 config SND_SOC_GTM601
        tristate 'GTM601 UMTS modem audio codec'
 
+config SND_SOC_HDAC_HDMI
+       tristate
+       select SND_HDA_EXT_CORE
+       select HDMI
+
 config SND_SOC_ICS43432
        tristate
 

diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 6359bdcf7f89e3b2988431d32d7982828f7cb13d..bcd5ad6b6fb0e8536bb095d2c31764bf84675da7 100644 (file)
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -59,8 +59,8 @@ snd-soc-es8328-objs := es8328.o
 snd-soc-es8328-i2c-objs := es8328-i2c.o
 snd-soc-es8328-spi-objs := es8328-spi.o
 snd-soc-gtm601-objs := gtm601.o
-snd-soc-ics43432-objs := ics43432.o
 snd-soc-hdac-hdmi-objs := hdac_hdmi.o
+snd-soc-ics43432-objs := ics43432.o
 snd-soc-isabelle-objs := isabelle.o
 snd-soc-jz4740-codec-objs := jz4740.o
 snd-soc-l3-objs := l3.o
@@ -255,8 +255,8 @@ obj-$(CONFIG_SND_SOC_ES8328)        += snd-soc-es8328.o
 obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
 obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
 obj-$(CONFIG_SND_SOC_GTM601)    += snd-soc-gtm601.o
-obj-$(CONFIG_SND_SOC_ICS43432) += snd-soc-ics43432.o
 obj-$(CONFIG_SND_SOC_HDAC_HDMI) += snd-soc-hdac-hdmi.o
+obj-$(CONFIG_SND_SOC_ICS43432) += snd-soc-ics43432.o
 obj-$(CONFIG_SND_SOC_ISABELLE) += snd-soc-isabelle.o
 obj-$(CONFIG_SND_SOC_JZ4740_CODEC)     += snd-soc-jz4740-codec.o
 obj-$(CONFIG_SND_SOC_L3)       += snd-soc-l3.o