Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next...

From Sascha Hauer:
ARM i.MX specific defconfig updates

* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT
  ARM: imx_v6_v7_defconfig: Add DA9052 regulator support

diff --combined arch/arm/configs/imx_v6_v7_defconfig
index 394ded624e375a8e1e36b04ee5b85cefbf5c9391,7ea6bde94aab5a81959d43431224fb7c5db0712a..508ac9d8e05697eb65a2c8704be4a26e5d3f2e82
--- 1/arch/arm/configs/imx_v6_v7_defconfig
--- 2/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@@ -32,7 -32,9 +32,7 @@@ CONFIG_MACH_VPR200=
  CONFIG_MACH_IMX51_DT=y
  CONFIG_MACH_MX51_3DS=y
  CONFIG_MACH_EUKREA_CPUIMX51SD=y
 -CONFIG_MACH_MX51_EFIKAMX=y
 -CONFIG_MACH_MX51_EFIKASB=y
 -CONFIG_MACH_IMX53_DT=y
 +CONFIG_SOC_IMX53=y
  CONFIG_SOC_IMX6Q=y
  CONFIG_MXC_PWM=y
  CONFIG_SMP=y
@@@ -40,6 -42,7 +40,6 @@@ CONFIG_VMSPLIT_2G=
  CONFIG_PREEMPT_VOLUNTARY=y
  CONFIG_AEABI=y
  # CONFIG_OABI_COMPAT is not set
 -CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
  CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
  CONFIG_VFP=y
  CONFIG_NEON=y
@@@ -139,24 -142,25 +139,27 @@@ CONFIG_I2C_IMX=
  CONFIG_SPI=y
  CONFIG_SPI_IMX=y
  CONFIG_GPIO_SYSFS=y
 +CONFIG_GPIO_MC9S08DZ60=y
  # CONFIG_HWMON is not set
  CONFIG_WATCHDOG=y
  CONFIG_IMX2_WDT=y
+ CONFIG_MFD_DA9052_I2C=y
  CONFIG_MFD_MC13XXX_SPI=y
  CONFIG_MFD_MC13XXX_I2C=y
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
+ CONFIG_REGULATOR_DA9052=y
  CONFIG_REGULATOR_MC13783=y
  CONFIG_REGULATOR_MC13892=y
  CONFIG_MEDIA_SUPPORT=y
  CONFIG_VIDEO_DEV=y
  CONFIG_V4L_PLATFORM_DRIVERS=y
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_SOC_CAMERA=y
  CONFIG_SOC_CAMERA_OV2640=y
  CONFIG_VIDEO_MX3=y
  CONFIG_FB=y
 +CONFIG_LCD_PLATFORM=y
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
  CONFIG_LCD_CLASS_DEVICE=y
  CONFIG_LCD_L4F00242T03=y
@@@ -178,9 -182,6 +181,9 @@@ CONFIG_SND_SOC_IMX_MC13783=
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MXC=y
 +CONFIG_USB_CHIPIDEA=y
 +CONFIG_USB_CHIPIDEA_HOST=y
 +CONFIG_USB_MXS_PHY=y
  CONFIG_USB_STORAGE=y
  CONFIG_MMC=y
  CONFIG_MMC_SDHCI=y