projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[linux-2.6-block.git]
/
arch
/
powerpc
/
configs
/
mpc85xx_smp_defconfig
diff --git
a/arch/powerpc/configs/mpc85xx_smp_defconfig
b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 5b0e2926becd0ffdc6142c65a4f1d7fe3bf10969..d1828427ae55ffb7b998e277b36404679352f7cc 100644
(file)
--- a/
arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/
arch/powerpc/configs/mpc85xx_smp_defconfig
@@
-143,6
+143,7
@@
CONFIG_SND_INTEL8X0=y
# CONFIG_SND_PPC is not set
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
+CONFIG_SND_POWERPC_SOC=y
CONFIG_HID_A4TECH=y
CONFIG_HID_APPLE=y
CONFIG_HID_BELKIN=y