ARM i.MX specific defconfig updates

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJQrjo8AAoJEPFlmONMx+eznE4QAKJKbqSgvKBPvBK6W+yNhOQ6
 BbeqbmbCjLkj5D0XeHtv08+uPKJdr0iRRbalazyUw138FYnhcSM4acDLUlMCnh62
 yJrmqK2hn96t+CinFeXnguiWTPBecKYYxwZh7/unFt2R/PvR/NlLQyLiQDaOuCbB
 0tlEMRWw8qH+aEt8dObw6R3+R1NMx1Mt3WvSvCdgM3JNWoyEXpdCSgW4NqFifK97
 V9cQCCi44JLqDahW9/p1XBgCoO6aTG1XTcY68mjR38dtGXCvPjaNAXkaEFjn41sE
 0qju2QaQ25nVHhAIsCkfXv5hzgQicSt+Qac8EFtDNOwrmmwHVxcfRcHipirjO0B5
 A7G+qOqP5GyYB0HqJWGl/Q9G6mWtFLk4YWP+RwCiPgF41k2J2KS7qJAJGcojQ3tO
 zM9lzXwpQQqIK6lqPtSd8901CIwLrX4/L0mK3MmMEXCcMOj6dJLYjycngwy9CnNS
 Ika/jb0mXn2H+4Qb1j/aH40Fse0kzU90x++DYfuc0adly6jNsiABMxM1d/Hayq0H
 +fqZ8USkTrITBD6cZs0Fn3patciqKNd0QTbKL0ycVsZjEPV57yrcXBgF/W0DEwfE
 jDgz5wu+SlhdhAnzK6NX5LiZ2vjnck5BIAnUA8hMJwo9Mgzu8XdRvBliE8MbSm8P
 6hinDe1ved9Uf3zghtMi
 =eawa
 -----END PGP SIGNATURE-----

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

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
This commit is contained in:
Olof Johansson 2012-11-25 23:31:47 -08:00
Родитель 4cf90df38c 5177ae56d1
Коммит 48b71e3ac1
2 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

@ -121,6 +121,7 @@ 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_MX2=y

Просмотреть файл

@ -143,15 +143,18 @@ 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