aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index eaba3b165d72..bb6fa568b620 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -143,6 +143,7 @@ CONFIG_SMSC911X=y
143# CONFIG_NET_VENDOR_STMICRO is not set 143# CONFIG_NET_VENDOR_STMICRO is not set
144CONFIG_AT803X_PHY=y 144CONFIG_AT803X_PHY=y
145CONFIG_MICREL_PHY=y 145CONFIG_MICREL_PHY=y
146CONFIG_SMSC_PHY=y
146CONFIG_USB_PEGASUS=m 147CONFIG_USB_PEGASUS=m
147CONFIG_USB_RTL8150=m 148CONFIG_USB_RTL8150=m
148CONFIG_USB_RTL8152=m 149CONFIG_USB_RTL8152=m
@@ -152,7 +153,6 @@ CONFIG_BRCMFMAC=m
152CONFIG_WL12XX=m 153CONFIG_WL12XX=m
153CONFIG_WLCORE_SDIO=m 154CONFIG_WLCORE_SDIO=m
154# CONFIG_WILINK_PLATFORM_DATA is not set 155# CONFIG_WILINK_PLATFORM_DATA is not set
155# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
156CONFIG_INPUT_EVDEV=y 156CONFIG_INPUT_EVDEV=y
157CONFIG_INPUT_EVBUG=m 157CONFIG_INPUT_EVBUG=m
158CONFIG_KEYBOARD_GPIO=y 158CONFIG_KEYBOARD_GPIO=y
@@ -165,6 +165,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y
165CONFIG_TOUCHSCREEN_EGALAX=y 165CONFIG_TOUCHSCREEN_EGALAX=y
166CONFIG_TOUCHSCREEN_IMX6UL_TSC=y 166CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
167CONFIG_TOUCHSCREEN_EDT_FT5X06=y 167CONFIG_TOUCHSCREEN_EDT_FT5X06=y
168CONFIG_TOUCHSCREEN_MAX11801=y
168CONFIG_TOUCHSCREEN_MC13783=y 169CONFIG_TOUCHSCREEN_MC13783=y
169CONFIG_TOUCHSCREEN_TSC2004=y 170CONFIG_TOUCHSCREEN_TSC2004=y
170CONFIG_TOUCHSCREEN_TSC2007=y 171CONFIG_TOUCHSCREEN_TSC2007=y
@@ -173,6 +174,7 @@ CONFIG_TOUCHSCREEN_SX8654=y
173CONFIG_TOUCHSCREEN_COLIBRI_VF50=y 174CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
174CONFIG_INPUT_MISC=y 175CONFIG_INPUT_MISC=y
175CONFIG_INPUT_MMA8450=y 176CONFIG_INPUT_MMA8450=y
177CONFIG_HID_MULTITOUCH=y
176CONFIG_SERIO_SERPORT=m 178CONFIG_SERIO_SERPORT=m
177# CONFIG_LEGACY_PTYS is not set 179# CONFIG_LEGACY_PTYS is not set
178CONFIG_SERIAL_IMX=y 180CONFIG_SERIAL_IMX=y
@@ -376,7 +378,6 @@ CONFIG_NLS_ISO8859_1=y
376CONFIG_NLS_ISO8859_15=m 378CONFIG_NLS_ISO8859_15=m
377CONFIG_NLS_UTF8=y 379CONFIG_NLS_UTF8=y
378CONFIG_PRINTK_TIME=y 380CONFIG_PRINTK_TIME=y
379CONFIG_DEBUG_FS=y
380CONFIG_MAGIC_SYSRQ=y 381CONFIG_MAGIC_SYSRQ=y
381# CONFIG_SCHED_DEBUG is not set 382# CONFIG_SCHED_DEBUG is not set
382CONFIG_PROVE_LOCKING=y 383CONFIG_PROVE_LOCKING=y