summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-04-22 05:09:14 -0400
committerMark Brown <broonie@kernel.org>2016-04-22 05:39:38 -0400
commit54aba08f13fab00f31938993c9f7a9b0cd54f666 (patch)
treeef781377e744d26b41d89ed9abea9212647aeaec /sound
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
ASoC: tidyup alphabetical order for SND_SOC_Bxx
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/Kconfig8
-rw-r--r--sound/soc/codecs/Makefile4
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 649e92a252ae..f7f64bd019a5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -43,6 +43,7 @@ config SND_SOC_ALL_CODECS
43 select SND_SOC_AK5386 43 select SND_SOC_AK5386
44 select SND_SOC_ALC5623 if I2C 44 select SND_SOC_ALC5623 if I2C
45 select SND_SOC_ALC5632 if I2C 45 select SND_SOC_ALC5632 if I2C
46 select SND_SOC_BT_SCO
46 select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC 47 select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
47 select SND_SOC_CS35L32 if I2C 48 select SND_SOC_CS35L32 if I2C
48 select SND_SOC_CS42L51_I2C if I2C 49 select SND_SOC_CS42L51_I2C if I2C
@@ -64,7 +65,6 @@ config SND_SOC_ALL_CODECS
64 select SND_SOC_DA732X if I2C 65 select SND_SOC_DA732X if I2C
65 select SND_SOC_DA9055 if I2C 66 select SND_SOC_DA9055 if I2C
66 select SND_SOC_DMIC 67 select SND_SOC_DMIC
67 select SND_SOC_BT_SCO
68 select SND_SOC_ES8328_SPI if SPI_MASTER 68 select SND_SOC_ES8328_SPI if SPI_MASTER
69 select SND_SOC_ES8328_I2C if I2C 69 select SND_SOC_ES8328_I2C if I2C
70 select SND_SOC_GTM601 70 select SND_SOC_GTM601
@@ -365,6 +365,9 @@ config SND_SOC_ALC5623
365config SND_SOC_ALC5632 365config SND_SOC_ALC5632
366 tristate 366 tristate
367 367
368config SND_SOC_BT_SCO
369 tristate
370
368config SND_SOC_CQ0093VC 371config SND_SOC_CQ0093VC
369 tristate 372 tristate
370 373
@@ -471,9 +474,6 @@ config SND_SOC_DA732X
471config SND_SOC_DA9055 474config SND_SOC_DA9055
472 tristate 475 tristate
473 476
474config SND_SOC_BT_SCO
475 tristate
476
477config SND_SOC_DMIC 477config SND_SOC_DMIC
478 tristate 478 tristate
479 479
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 185a712a7fe7..12a1fe22eaa1 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -32,6 +32,7 @@ snd-soc-ak4642-objs := ak4642.o
32snd-soc-ak4671-objs := ak4671.o 32snd-soc-ak4671-objs := ak4671.o
33snd-soc-ak5386-objs := ak5386.o 33snd-soc-ak5386-objs := ak5386.o
34snd-soc-arizona-objs := arizona.o 34snd-soc-arizona-objs := arizona.o
35snd-soc-bt-sco-objs := bt-sco.o
35snd-soc-cq93vc-objs := cq93vc.o 36snd-soc-cq93vc-objs := cq93vc.o
36snd-soc-cs35l32-objs := cs35l32.o 37snd-soc-cs35l32-objs := cs35l32.o
37snd-soc-cs42l51-objs := cs42l51.o 38snd-soc-cs42l51-objs := cs42l51.o
@@ -55,7 +56,6 @@ snd-soc-da7218-objs := da7218.o
55snd-soc-da7219-objs := da7219.o da7219-aad.o 56snd-soc-da7219-objs := da7219.o da7219-aad.o
56snd-soc-da732x-objs := da732x.o 57snd-soc-da732x-objs := da732x.o
57snd-soc-da9055-objs := da9055.o 58snd-soc-da9055-objs := da9055.o
58snd-soc-bt-sco-objs := bt-sco.o
59snd-soc-dmic-objs := dmic.o 59snd-soc-dmic-objs := dmic.o
60snd-soc-es8328-objs := es8328.o 60snd-soc-es8328-objs := es8328.o
61snd-soc-es8328-i2c-objs := es8328-i2c.o 61snd-soc-es8328-i2c-objs := es8328-i2c.o
@@ -241,6 +241,7 @@ obj-$(CONFIG_SND_SOC_AK5386) += snd-soc-ak5386.o
241obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o 241obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o
242obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o 242obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o
243obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o 243obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
244obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o
244obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o 245obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
245obj-$(CONFIG_SND_SOC_CS35L32) += snd-soc-cs35l32.o 246obj-$(CONFIG_SND_SOC_CS35L32) += snd-soc-cs35l32.o
246obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o 247obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o
@@ -264,7 +265,6 @@ obj-$(CONFIG_SND_SOC_DA7218) += snd-soc-da7218.o
264obj-$(CONFIG_SND_SOC_DA7219) += snd-soc-da7219.o 265obj-$(CONFIG_SND_SOC_DA7219) += snd-soc-da7219.o
265obj-$(CONFIG_SND_SOC_DA732X) += snd-soc-da732x.o 266obj-$(CONFIG_SND_SOC_DA732X) += snd-soc-da732x.o
266obj-$(CONFIG_SND_SOC_DA9055) += snd-soc-da9055.o 267obj-$(CONFIG_SND_SOC_DA9055) += snd-soc-da9055.o
267obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o
268obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o 268obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o
269obj-$(CONFIG_SND_SOC_ES8328) += snd-soc-es8328.o 269obj-$(CONFIG_SND_SOC_ES8328) += snd-soc-es8328.o
270obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o 270obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o