git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
mpc85xx_smp_defconfig
diff --git
a/arch/powerpc/configs/mpc85xx_smp_defconfig
b/arch/powerpc/configs/mpc85xx_smp_defconfig
index
908c941
..
9693f6e
100644
(file)
--- a/
arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/
arch/powerpc/configs/mpc85xx_smp_defconfig
@@
-140,6
+140,7
@@
CONFIG_SND=y
CONFIG_SND_INTEL8X0=y
# CONFIG_SND_PPC is not set
# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
CONFIG_HID_A4TECH=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y