summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-11-03 02:35:42 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-11-03 02:35:42 +0100
commit77e525493f74f9f2e33a41e9e65b54e810ac3dd0 (patch)
treea1801950ad1aeb120ae7a893831a8aa3ec6b646f
parent4e979f158697958171041e3e84526bb47fe1b412 (diff)
apalis/colibri_imx6: remove duplicate stmpe adc from defconfig
Remove duplicate CONFIG_STMPE_ADC from both defconfigs. While at it also remove obsolete commented out CONFIG_NET_VENDOR_ATHEROS being not set on Colibri iMX6.
-rw-r--r--arch/arm/configs/apalis_imx6_defconfig1
-rw-r--r--arch/arm/configs/colibri_imx6_defconfig2
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig
index f88a041df40a..0c155dcf94f3 100644
--- a/arch/arm/configs/apalis_imx6_defconfig
+++ b/arch/arm/configs/apalis_imx6_defconfig
@@ -281,7 +281,6 @@ CONFIG_STAGING=y
CONFIG_STMPE_ADC=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=y
-CONFIG_STMPE_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y
diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig
index 623ebff0b546..20486eb1b6e5 100644
--- a/arch/arm/configs/colibri_imx6_defconfig
+++ b/arch/arm/configs/colibri_imx6_defconfig
@@ -114,7 +114,6 @@ CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ATHEROS is not set
# CONFIG_NET_CADENCE is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -274,7 +273,6 @@ CONFIG_STMPE_ADC=y
CONFIG_EXTCON=y
CONFIG_EXTCON_USB_GPIO=y
CONFIG_IIO=y
-CONFIG_STMPE_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y