diff --git a/config-arm-omap b/config-arm-omap
index 524ec3f..e1535a9 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -193,8 +193,16 @@ CONFIG_SPI_OMAP24XX=y
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_REGULATOR_TWL4030=y
+# Enable V4L2 drivers for OMAP2+
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_VPFE_CAPTURE=m
 CONFIG_VIDEO_OMAP2_VOUT=m
 # CONFIG_VIDEO_OMAP3 is not set
+# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVI=m
 
 CONFIG_DRM=m
 CONFIG_DRM_OMAP=m