1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig
index c27d46797bec..7fed8482ce6d 100644
--- a/arch/arm/configs/colibri_imx6_defconfig
+++ b/arch/arm/configs/colibri_imx6_defconfig
@@ -27,7 +27,6 @@ CONFIG_SOC_IMX6Q=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_CMA=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@@ -75,7 +74,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_LL=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_RFKILL=y
@@ -129,8 +127,6 @@ CONFIG_MICREL_PHY=y
 CONFIG_PPP=m
 CONFIG_USB_USBNET=y
 # CONFIG_WLAN is not set
-CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_IMX=y
@@ -143,7 +139,6 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_SERIO_SERPORT=m
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
@@ -194,9 +189,6 @@ CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 CONFIG_VIDEO_MXC_PXP_V4L2=y
 CONFIG_SOC_CAMERA=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
 CONFIG_DRM=y
 CONFIG_DRM_VIVANTE=y
 CONFIG_FB_MXS=y
@@ -265,7 +257,6 @@ CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_MIPI_CSI2=y
 CONFIG_NEW_LEDS=y
@@ -288,10 +279,10 @@ CONFIG_IMX_SDMA=y
 CONFIG_MXC_PXP_V2=y
 # CONFIG_MX3_IPU is not set
 CONFIG_STAGING=y
-CONFIG_STMPE_ADC=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
+CONFIG_STMPE_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
 CONFIG_EXT4_FS=y
@@ -336,8 +327,6 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_FTRACE is not set
@@ -346,7 +335,6 @@ CONFIG_DEBUG_USER=y
 CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTS=y