aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v4_v5_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 13:42:09 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-27 13:42:09 +0000
commitdae2efd750393565a90fa75eeab289dbeacc166e (patch)
tree7923561b311b492c1550fe6ebc90e482c69260da /arch/arm/configs/imx_v4_v5_defconfig
parentafde9626089e3d0c32090120960d1e32f65e3be4 (diff)
parent15cc1b1c1e8848ffa711f4ea24c919627a1159da (diff)
Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers
* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx_v4_v5_defconfig: Update defconfig ARM: mx27_3ds: Add camera support ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index b5f08e9813b..d9eddfd7742 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -45,6 +45,7 @@ CONFIG_FPE_NWFPE=y
CONFIG_FPE_NWFPE_XP=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
+CONFIG_SMSC911X=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
@@ -117,6 +118,21 @@ CONFIG_FB_IMX=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
+CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_VIDEO_MX2_HOSTSUPPORT=y
+CONFIG_VIDEO_MX2=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y