diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-01-28 22:05:05 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-16 09:49:30 +0200 |
commit | 19a3dab69747e1bace7987da5cd527fe998d7012 (patch) | |
tree | f52718eaa1b83d2841af313c810c0fb176a36e72 /arch/arm/configs/imx_v4_v5_defconfig | |
parent | c8349fb437d37b7e0919ffaac3f8dca301f2f625 (diff) | |
download | blackbird-op-linux-19a3dab69747e1bace7987da5cd527fe998d7012.tar.gz blackbird-op-linux-19a3dab69747e1bace7987da5cd527fe998d7012.zip |
ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 b5ac644e12af..7bdfab24a764 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 |