diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-01-28 16:05:05 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-16 03:49:30 -0400 |
commit | 19a3dab69747e1bace7987da5cd527fe998d7012 (patch) | |
tree | f52718eaa1b83d2841af313c810c0fb176a36e72 /arch/arm/configs | |
parent | c8349fb437d37b7e0919ffaac3f8dca301f2f625 (diff) |
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')
-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 | |||
92 | # CONFIG_INPUT_MOUSE is not set | 92 | # CONFIG_INPUT_MOUSE is not set |
93 | CONFIG_INPUT_TOUCHSCREEN=y | 93 | CONFIG_INPUT_TOUCHSCREEN=y |
94 | CONFIG_TOUCHSCREEN_ADS7846=m | 94 | CONFIG_TOUCHSCREEN_ADS7846=m |
95 | CONFIG_TOUCHSCREEN_MC13783=m | ||
95 | # CONFIG_SERIO is not set | 96 | # CONFIG_SERIO is not set |
96 | # CONFIG_LEGACY_PTYS is not set | 97 | # CONFIG_LEGACY_PTYS is not set |
97 | CONFIG_SERIAL_8250=m | 98 | CONFIG_SERIAL_8250=m |
@@ -107,7 +108,8 @@ CONFIG_SPI_SPIDEV=y | |||
107 | CONFIG_W1=y | 108 | CONFIG_W1=y |
108 | CONFIG_W1_MASTER_MXC=y | 109 | CONFIG_W1_MASTER_MXC=y |
109 | CONFIG_W1_SLAVE_THERM=y | 110 | CONFIG_W1_SLAVE_THERM=y |
110 | # CONFIG_HWMON is not set | 111 | CONFIG_HWMON=m |
112 | CONFIG_SENSORS_MC13783_ADC=m | ||
111 | CONFIG_WATCHDOG=y | 113 | CONFIG_WATCHDOG=y |
112 | CONFIG_IMX2_WDT=y | 114 | CONFIG_IMX2_WDT=y |
113 | CONFIG_MFD_MC13XXX=y | 115 | CONFIG_MFD_MC13XXX=y |