git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
Kconfig
diff --git
a/sound/soc/Kconfig
b/sound/soc/Kconfig
index 97b255233175769191aa6a2348e9fc20a58ef280..276585215160ddd28f1b504c8ae76c20f591c268 100644
(file)
--- a/
sound/soc/Kconfig
+++ b/
sound/soc/Kconfig
@@
-28,6
+28,7
@@
source "sound/soc/at91/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
source "sound/soc/sh/Kconfig"
+source "sound/soc/fsl/Kconfig"
# Supported codecs
source "sound/soc/codecs/Kconfig"