From a94dc38b792210827263ac36a6212a37a2ea3bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 28 Jan 2012 22:05:05 +0100 Subject: [PATCH] --- yaml --- r: 303419 b: refs/heads/master c: 19a3dab69747e1bace7987da5cd527fe998d7012 h: refs/heads/master i: 303417: d3c450cacab361d894d4dc3466d97eeb430885ce 303415: a8561c5c4aa17935121e36d99043f9621a89c3c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/imx_v4_v5_defconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fead924d004f..953fd1adddf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8349fb437d37b7e0919ffaac3f8dca301f2f625 +refs/heads/master: 19a3dab69747e1bace7987da5cd527fe998d7012 diff --git a/trunk/arch/arm/configs/imx_v4_v5_defconfig b/trunk/arch/arm/configs/imx_v4_v5_defconfig index b5ac644e12af..7bdfab24a764 100644 --- a/trunk/arch/arm/configs/imx_v4_v5_defconfig +++ b/trunk/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