projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[cascardo/linux.git]
/
arch
/
powerpc
/
configs
/
mpc85xx_smp_defconfig
diff --git
a/arch/powerpc/configs/mpc85xx_smp_defconfig
b/arch/powerpc/configs/mpc85xx_smp_defconfig
index
a075da2
..
d62c801
100644
(file)
--- a/
arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/
arch/powerpc/configs/mpc85xx_smp_defconfig
@@
-126,6
+126,9
@@
CONFIG_I2C_CPM=m
CONFIG_I2C_MPC=y
# CONFIG_HWMON is not set
CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+CONFIG_FB_FSL_DIU=y
+# CONFIG_VGA_CONSOLE is not set
CONFIG_SOUND=y
CONFIG_SND=y
# CONFIG_SND_SUPPORT_OLD_API is not set