summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2016-11-08 14:38:01 -0800
committerMax Krummenacher <max.krummenacher@toradex.com>2017-03-15 18:35:49 +0100
commitc7feb3cf69a8b662abb0efbbbfde6f116f39b06b (patch)
treef66729e90c8253b53bcb3a69eafdbc7068a4f848
parente7e358c119601938d724a4fe5377a10c638c5197 (diff)
ARM: configs: colibri_vf: configure IPv6 SIT driver as module
SIT tunnels (IPv6 over IPv4) are not often used hence configure the driver as a module. This also gets rid of the extra network interface sit0 by default. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/configs/colibri_vf_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/colibri_vf_defconfig b/arch/arm/configs/colibri_vf_defconfig
index 17ad8272439a..46e0bf0d7d6c 100644
--- a/arch/arm/configs/colibri_vf_defconfig
+++ b/arch/arm/configs/colibri_vf_defconfig
@@ -57,6 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
CONFIG_NETFILTER=y
CONFIG_BRIDGE_NETFILTER=y
CONFIG_NF_CONNTRACK=y
@@ -212,7 +213,6 @@ CONFIG_SND=y
# CONFIG_SND_SPI is not set
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_SAI=y
CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_FSL_SAI_WM9712=y
CONFIG_HIDRAW=y
@@ -271,7 +271,6 @@ CONFIG_FSL_EDMA=y
CONFIG_EXTCON=y
CONFIG_EXTCON_USB_GPIO=y
CONFIG_IIO=y
-CONFIG_IIO_TRIGGER=y
CONFIG_VF610_ADC=y
CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y