diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /arch/arm/configs/imx_v6_v7_defconfig | |
parent | 6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d (diff) | |
parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 5dfadfbf7c90..44f117aab52c 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -141,6 +141,7 @@ CONFIG_I2C_IMX=y | |||
141 | CONFIG_SPI=y | 141 | CONFIG_SPI=y |
142 | CONFIG_SPI_IMX=y | 142 | CONFIG_SPI_IMX=y |
143 | CONFIG_GPIO_SYSFS=y | 143 | CONFIG_GPIO_SYSFS=y |
144 | CONFIG_GPIO_MC9S08DZ60=y | ||
144 | # CONFIG_HWMON is not set | 145 | # CONFIG_HWMON is not set |
145 | CONFIG_WATCHDOG=y | 146 | CONFIG_WATCHDOG=y |
146 | CONFIG_IMX2_WDT=y | 147 | CONFIG_IMX2_WDT=y |
@@ -157,6 +158,7 @@ CONFIG_SOC_CAMERA=y | |||
157 | CONFIG_SOC_CAMERA_OV2640=y | 158 | CONFIG_SOC_CAMERA_OV2640=y |
158 | CONFIG_VIDEO_MX3=y | 159 | CONFIG_VIDEO_MX3=y |
159 | CONFIG_FB=y | 160 | CONFIG_FB=y |
161 | CONFIG_LCD_PLATFORM=y | ||
160 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 162 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
161 | CONFIG_LCD_CLASS_DEVICE=y | 163 | CONFIG_LCD_CLASS_DEVICE=y |
162 | CONFIG_LCD_L4F00242T03=y | 164 | CONFIG_LCD_L4F00242T03=y |