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 branch 'x86/amd-nb' into x86/apic-cleanups
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
mpc85xx_defconfig
diff --git
a/arch/powerpc/configs/mpc85xx_defconfig
b/arch/powerpc/configs/mpc85xx_defconfig
index
c3b113b
..
3aeb594
100644
(file)
--- a/
arch/powerpc/configs/mpc85xx_defconfig
+++ b/
arch/powerpc/configs/mpc85xx_defconfig
@@
-124,6
+124,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