diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-25 11:04:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-25 11:04:14 -0700 |
| commit | fd273d4415027f9b519d5a94e4fc030f278f2ad3 (patch) | |
| tree | 5c45f3b95817b82bff534e4b1f094c0147a23393 /arch/arm/configs/imx_v4_v5_defconfig | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | 435ca24116bc5365a10fa0be1bf1c1e4c5680157 (diff) | |
| download | blackbird-op-linux-fd273d4415027f9b519d5a94e4fc030f278f2ad3.tar.gz blackbird-op-linux-fd273d4415027f9b519d5a94e4fc030f278f2ad3.zip | |
Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
* tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX: Visstrim_M10: Add board version detection.
ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783
ARM: i.MX: i.MX35-PDK: Add regulator support
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 6b31cb60daab..09a02963cf58 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -92,6 +92,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_MC13783=m # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=m @@ -107,7 +108,8 @@ CONFIG_SPI_SPIDEV=y CONFIG_W1=y CONFIG_W1_MASTER_MXC=y CONFIG_W1_SLAVE_THERM=y -# CONFIG_HWMON is not set +CONFIG_HWMON=m +CONFIG_SENSORS_MC13783_ADC=m CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_MFD_MC13XXX=y |
