projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ctxfi' into for-linus
[linux-2.6]
/
sound
/
soc
/
Kconfig
diff --git
a/sound/soc/Kconfig
b/sound/soc/Kconfig
index
3d2bb6f
..
d3e786a
100644
(file)
--- a/
sound/soc/Kconfig
+++ b/
sound/soc/Kconfig
@@
-32,7
+32,9
@@
source "sound/soc/fsl/Kconfig"
source "sound/soc/omap/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
+source "sound/soc/s6000/Kconfig"
source "sound/soc/sh/Kconfig"
+source "sound/soc/txx9/Kconfig"
# Supported codecs
source "sound/soc/codecs/Kconfig"