From fbe21c6046aa0a95ee5739e3d8ec3ba128e35d6b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 8 Nov 2016 14:16:22 -0800 Subject: apalis_imx6/colibri_imx6: 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 Acked-by: Max Krummenacher --- arch/arm/configs/colibri_imx6_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/configs/colibri_imx6_defconfig') diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index beb14c6d3413..836220c3fa60 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -63,6 +63,7 @@ CONFIG_IP_PNP_DHCP=y # 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_CAN=y CONFIG_CAN_VCAN=y @@ -190,8 +191,8 @@ CONFIG_VIDEO_MXC_CAPTURE=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m -CONFIG_MXC_TVIN_ADV7280=m CONFIG_MXC_TVIN_ADV7180=m +CONFIG_MXC_TVIN_ADV7280=m CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y @@ -261,7 +262,6 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y CONFIG_MXC_MIPI_CSI2=y -CONFIG_MXC_MLB150=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y -- cgit v1.2.3