projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Ease merge difficulties from new architectures
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
Kconfig
diff --git
a/sound/soc/Kconfig
b/sound/soc/Kconfig
index 615ebf0b76e754c96cde95d2a22acdaf63b44676..ef025c66cc669c49c7b4537893ba76860fbd2397 100644
(file)
--- a/
sound/soc/Kconfig
+++ b/
sound/soc/Kconfig
@@
-22,16
+22,16
@@
if SND_SOC
config SND_SOC_AC97_BUS
bool
config SND_SOC_AC97_BUS
bool
-# All the supported So
c'
s
+# All the supported So
C
s
source "sound/soc/atmel/Kconfig"
source "sound/soc/au1x/Kconfig"
source "sound/soc/atmel/Kconfig"
source "sound/soc/au1x/Kconfig"
+source "sound/soc/blackfin/Kconfig"
+source "sound/soc/davinci/Kconfig"
+source "sound/soc/fsl/Kconfig"
+source "sound/soc/omap/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
source "sound/soc/sh/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
source "sound/soc/sh/Kconfig"
-source "sound/soc/fsl/Kconfig"
-source "sound/soc/davinci/Kconfig"
-source "sound/soc/omap/Kconfig"
-source "sound/soc/blackfin/Kconfig"
# Supported codecs
source "sound/soc/codecs/Kconfig"
# Supported codecs
source "sound/soc/codecs/Kconfig"