summaryrefslogtreecommitdiff
path: root/arch/arm/configs/n770_defconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-01 13:11:07 +0300
committerTakashi Iwai <tiwai@suse.de>2009-11-01 13:11:07 +0300
commite87a3dd33eab30b4db539500064a9584867e4f2c (patch)
tree2f7ad16e46ae30518ff63bb5391b63f7f7cc74dd /arch/arm/configs/n770_defconfig
parentb14f5de731ae657d498d18d713c6431bfbeefb4b (diff)
parent3d00941371a765779c4e3509214c7e5793cce1fe (diff)
downloadlinux-e87a3dd33eab30b4db539500064a9584867e4f2c.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/configs/n770_defconfig')
-rw-r--r--arch/arm/configs/n770_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig
index 672f6db06a52..a1657b73683f 100644
--- a/arch/arm/configs/n770_defconfig
+++ b/arch/arm/configs/n770_defconfig
@@ -875,7 +875,7 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y
CONFIG_FB_OMAP_LCDC_HWA742=y
# CONFIG_FB_OMAP_LCDC_BLIZZARD is not set
CONFIG_FB_OMAP_MANUAL_UPDATE=y
-# CONFIG_FB_OMAP_LCD_MIPID is not set
+CONFIG_FB_OMAP_LCD_MIPID=y
# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
# CONFIG_FB_OMAP_DMA_TUNE is not set