aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2016-12-09 03:56:24 -0500
committerMark Brown <broonie@kernel.org>2016-12-15 06:41:46 -0500
commitc7f87f96e384b7ecc41a6c0c8c397e095284ede0 (patch)
tree57df02ea37b414c8f3242a68901444bbdefd736e
parenta5de5b74a50113564a1e0850e2da96c37c35e55d (diff)
ASoC: rt5665: Make SND_SOC_RT5665 entry sort in Kconfig and Makefile
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/Kconfig10
-rw-r--r--sound/soc/codecs/Makefile4
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9e1718a8cb1c..cfc108e5e5ec 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -117,8 +117,8 @@ config SND_SOC_ALL_CODECS
117 select SND_SOC_RT5651 if I2C 117 select SND_SOC_RT5651 if I2C
118 select SND_SOC_RT5659 if I2C 118 select SND_SOC_RT5659 if I2C
119 select SND_SOC_RT5660 if I2C 119 select SND_SOC_RT5660 if I2C
120 select SND_SOC_RT5665 if I2C
121 select SND_SOC_RT5663 if I2C 120 select SND_SOC_RT5663 if I2C
121 select SND_SOC_RT5665 if I2C
122 select SND_SOC_RT5670 if I2C 122 select SND_SOC_RT5670 if I2C
123 select SND_SOC_RT5677 if I2C && SPI_MASTER 123 select SND_SOC_RT5677 if I2C && SPI_MASTER
124 select SND_SOC_SGTL5000 if I2C 124 select SND_SOC_SGTL5000 if I2C
@@ -668,8 +668,8 @@ config SND_SOC_RL6231
668 default y if SND_SOC_RT5651=y 668 default y if SND_SOC_RT5651=y
669 default y if SND_SOC_RT5659=y 669 default y if SND_SOC_RT5659=y
670 default y if SND_SOC_RT5660=y 670 default y if SND_SOC_RT5660=y
671 default y if SND_SOC_RT5665=y
672 default y if SND_SOC_RT5663=y 671 default y if SND_SOC_RT5663=y
672 default y if SND_SOC_RT5665=y
673 default y if SND_SOC_RT5670=y 673 default y if SND_SOC_RT5670=y
674 default y if SND_SOC_RT5677=y 674 default y if SND_SOC_RT5677=y
675 default m if SND_SOC_RT5514=m 675 default m if SND_SOC_RT5514=m
@@ -679,8 +679,8 @@ config SND_SOC_RL6231
679 default m if SND_SOC_RT5651=m 679 default m if SND_SOC_RT5651=m
680 default m if SND_SOC_RT5659=m 680 default m if SND_SOC_RT5659=m
681 default m if SND_SOC_RT5660=m 681 default m if SND_SOC_RT5660=m
682 default m if SND_SOC_RT5665=m
683 default m if SND_SOC_RT5663=m 682 default m if SND_SOC_RT5663=m
683 default m if SND_SOC_RT5665=m
684 default m if SND_SOC_RT5670=m 684 default m if SND_SOC_RT5670=m
685 default m if SND_SOC_RT5677=m 685 default m if SND_SOC_RT5677=m
686 686
@@ -728,10 +728,10 @@ config SND_SOC_RT5659
728config SND_SOC_RT5660 728config SND_SOC_RT5660
729 tristate 729 tristate
730 730
731config SND_SOC_RT5665 731config SND_SOC_RT5663
732 tristate 732 tristate
733 733
734config SND_SOC_RT5663 734config SND_SOC_RT5665
735 tristate 735 tristate
736 736
737config SND_SOC_RT5670 737config SND_SOC_RT5670
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 7e1dad79610b..2624c7324d4a 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -118,8 +118,8 @@ snd-soc-rt5645-objs := rt5645.o
118snd-soc-rt5651-objs := rt5651.o 118snd-soc-rt5651-objs := rt5651.o
119snd-soc-rt5659-objs := rt5659.o 119snd-soc-rt5659-objs := rt5659.o
120snd-soc-rt5660-objs := rt5660.o 120snd-soc-rt5660-objs := rt5660.o
121snd-soc-rt5665-objs := rt5665.o
122snd-soc-rt5663-objs := rt5663.o 121snd-soc-rt5663-objs := rt5663.o
122snd-soc-rt5665-objs := rt5665.o
123snd-soc-rt5670-objs := rt5670.o 123snd-soc-rt5670-objs := rt5670.o
124snd-soc-rt5677-objs := rt5677.o 124snd-soc-rt5677-objs := rt5677.o
125snd-soc-rt5677-spi-objs := rt5677-spi.o 125snd-soc-rt5677-spi-objs := rt5677-spi.o
@@ -346,8 +346,8 @@ obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o
346obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o 346obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o
347obj-$(CONFIG_SND_SOC_RT5659) += snd-soc-rt5659.o 347obj-$(CONFIG_SND_SOC_RT5659) += snd-soc-rt5659.o
348obj-$(CONFIG_SND_SOC_RT5660) += snd-soc-rt5660.o 348obj-$(CONFIG_SND_SOC_RT5660) += snd-soc-rt5660.o
349obj-$(CONFIG_SND_SOC_RT5665) += snd-soc-rt5665.o
350obj-$(CONFIG_SND_SOC_RT5663) += snd-soc-rt5663.o 349obj-$(CONFIG_SND_SOC_RT5663) += snd-soc-rt5663.o
350obj-$(CONFIG_SND_SOC_RT5665) += snd-soc-rt5665.o
351obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o 351obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o
352obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o 352obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o
353obj-$(CONFIG_SND_SOC_RT5677_SPI) += snd-soc-rt5677-spi.o 353obj-$(CONFIG_SND_SOC_RT5677_SPI) += snd-soc-rt5677-spi.o