diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:00:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:00:30 +0200 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /arch/powerpc/configs/mpc85xx_smp_defconfig | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_smp_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index a075da2ea3fb..d62c8016f4bc 100644 --- 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 |