Merge branch 'imx/defconfig' into next/drivers

Conflicts:
	arch/arm/configs/imx_v6_v7_defconfig

Resolves one conflict with an earlier branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/configs/imx_v6_v7_defconfig
index 6ae457aeea490ac957efce2eb93ce08f22bda7d3,3cd606905178a5c299331589435b3f5f08850f51..dc6f6411bbf5e9fb640831da44aa36f3d82cbb5c
--- 1/arch/arm/configs/imx_v6_v7_defconfig
--- 2/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@@ -126,39 -124,8 +126,40 @@@ CONFIG_WATCHDOG=
  CONFIG_IMX2_WDT=y
  CONFIG_MFD_MC13XXX=y
  CONFIG_REGULATOR=y
+ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 +CONFIG_REGULATOR_MC13783=y
  CONFIG_REGULATOR_MC13892=y
 +CONFIG_MEDIA_SUPPORT=y
 +CONFIG_VIDEO_V4L2=y
 +CONFIG_VIDEO_DEV=y
 +CONFIG_VIDEO_V4L2_COMMON=y
 +CONFIG_VIDEOBUF_GEN=y
 +CONFIG_VIDEOBUF2_CORE=y
 +CONFIG_VIDEOBUF2_MEMOPS=y
 +CONFIG_VIDEOBUF2_DMA_CONTIG=y
 +CONFIG_VIDEO_CAPTURE_DRIVERS=y
 +CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_SOC_CAMERA=y
 +CONFIG_SOC_CAMERA_OV2640=y
 +CONFIG_MX3_VIDEO=y
 +CONFIG_VIDEO_MX3=y
 +CONFIG_FB=y
 +CONFIG_FB_MX3=y
 +CONFIG_BACKLIGHT_LCD_SUPPORT=y
 +CONFIG_LCD_CLASS_DEVICE=y
 +CONFIG_LCD_L4F00242T03=y
 +CONFIG_BACKLIGHT_CLASS_DEVICE=y
 +CONFIG_BACKLIGHT_GENERIC=y
 +CONFIG_DUMMY_CONSOLE=y
 +CONFIG_FRAMEBUFFER_CONSOLE=y
 +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 +CONFIG_FONTS=y
 +CONFIG_FONT_8x8=y
 +CONFIG_FONT_8x16=y
 +CONFIG_LOGO=y
 +CONFIG_LOGO_LINUX_MONO=y
 +CONFIG_LOGO_LINUX_VGA16=y
 +CONFIG_LOGO_LINUX_CLUT224=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MXC=y