diff options
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 5 |
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 |
144 | CONFIG_AT803X_PHY=y | 144 | CONFIG_AT803X_PHY=y |
145 | CONFIG_MICREL_PHY=y | 145 | CONFIG_MICREL_PHY=y |
146 | CONFIG_SMSC_PHY=y | ||
146 | CONFIG_USB_PEGASUS=m | 147 | CONFIG_USB_PEGASUS=m |
147 | CONFIG_USB_RTL8150=m | 148 | CONFIG_USB_RTL8150=m |
148 | CONFIG_USB_RTL8152=m | 149 | CONFIG_USB_RTL8152=m |
@@ -152,7 +153,6 @@ CONFIG_BRCMFMAC=m | |||
152 | CONFIG_WL12XX=m | 153 | CONFIG_WL12XX=m |
153 | CONFIG_WLCORE_SDIO=m | 154 | CONFIG_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 | ||
156 | CONFIG_INPUT_EVDEV=y | 156 | CONFIG_INPUT_EVDEV=y |
157 | CONFIG_INPUT_EVBUG=m | 157 | CONFIG_INPUT_EVBUG=m |
158 | CONFIG_KEYBOARD_GPIO=y | 158 | CONFIG_KEYBOARD_GPIO=y |
@@ -165,6 +165,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y | |||
165 | CONFIG_TOUCHSCREEN_EGALAX=y | 165 | CONFIG_TOUCHSCREEN_EGALAX=y |
166 | CONFIG_TOUCHSCREEN_IMX6UL_TSC=y | 166 | CONFIG_TOUCHSCREEN_IMX6UL_TSC=y |
167 | CONFIG_TOUCHSCREEN_EDT_FT5X06=y | 167 | CONFIG_TOUCHSCREEN_EDT_FT5X06=y |
168 | CONFIG_TOUCHSCREEN_MAX11801=y | ||
168 | CONFIG_TOUCHSCREEN_MC13783=y | 169 | CONFIG_TOUCHSCREEN_MC13783=y |
169 | CONFIG_TOUCHSCREEN_TSC2004=y | 170 | CONFIG_TOUCHSCREEN_TSC2004=y |
170 | CONFIG_TOUCHSCREEN_TSC2007=y | 171 | CONFIG_TOUCHSCREEN_TSC2007=y |
@@ -173,6 +174,7 @@ CONFIG_TOUCHSCREEN_SX8654=y | |||
173 | CONFIG_TOUCHSCREEN_COLIBRI_VF50=y | 174 | CONFIG_TOUCHSCREEN_COLIBRI_VF50=y |
174 | CONFIG_INPUT_MISC=y | 175 | CONFIG_INPUT_MISC=y |
175 | CONFIG_INPUT_MMA8450=y | 176 | CONFIG_INPUT_MMA8450=y |
177 | CONFIG_HID_MULTITOUCH=y | ||
176 | CONFIG_SERIO_SERPORT=m | 178 | CONFIG_SERIO_SERPORT=m |
177 | # CONFIG_LEGACY_PTYS is not set | 179 | # CONFIG_LEGACY_PTYS is not set |
178 | CONFIG_SERIAL_IMX=y | 180 | CONFIG_SERIAL_IMX=y |
@@ -376,7 +378,6 @@ CONFIG_NLS_ISO8859_1=y | |||
376 | CONFIG_NLS_ISO8859_15=m | 378 | CONFIG_NLS_ISO8859_15=m |
377 | CONFIG_NLS_UTF8=y | 379 | CONFIG_NLS_UTF8=y |
378 | CONFIG_PRINTK_TIME=y | 380 | CONFIG_PRINTK_TIME=y |
379 | CONFIG_DEBUG_FS=y | ||
380 | CONFIG_MAGIC_SYSRQ=y | 381 | CONFIG_MAGIC_SYSRQ=y |
381 | # CONFIG_SCHED_DEBUG is not set | 382 | # CONFIG_SCHED_DEBUG is not set |
382 | CONFIG_PROVE_LOCKING=y | 383 | CONFIG_PROVE_LOCKING=y |