diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-11-03 02:35:42 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-12-26 14:50:37 +0100 |
| commit | 2bc238c55974901ca3078a8e39edaeaa4d9b3d62 (patch) | |
| tree | 05784ff2484e69e3ce9d5c94e5be2a7f3e2555d5 | |
| parent | d499fb554ef9b5bcc855e56176c4d864399821c9 (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_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 2 |
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 |