71 lines
1.8 KiB
Diff
71 lines
1.8 KiB
Diff
|
From bf0e127060951623a842c078b18585afff833227 Mon Sep 17 00:00:00 2001
|
||
|
|
From: popcornmix <popcornmix@gmail.com>
|
||
|
|
Date: Tue, 12 Apr 2016 12:45:16 +0100
|
||
|
|
Subject: [PATCH 237/304] config: Make IPV6 a module and regenerate with
|
||
|
|
defconfig
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/arm/configs/bcm2709_defconfig | 4 ++--
|
||
|
|
arch/arm/configs/bcmrpi_defconfig | 6 +++---
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
||
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
||
|
|
@@ -101,6 +101,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
|
||
|
|
CONFIG_INET_XFRM_MODE_BEET=m
|
||
|
|
CONFIG_INET_LRO=m
|
||
|
|
CONFIG_INET_DIAG=m
|
||
|
|
+CONFIG_IPV6=m
|
||
|
|
CONFIG_IPV6_ROUTER_PREF=y
|
||
|
|
CONFIG_INET6_AH=m
|
||
|
|
CONFIG_INET6_ESP=m
|
||
|
|
@@ -600,10 +601,9 @@ CONFIG_HW_RANDOM=y
|
||
|
|
CONFIG_RAW_DRIVER=y
|
||
|
|
CONFIG_I2C=y
|
||
|
|
CONFIG_I2C_CHARDEV=m
|
||
|
|
+CONFIG_I2C_MUX_PCA954x=m
|
||
|
|
CONFIG_I2C_BCM2708=m
|
||
|
|
CONFIG_I2C_GPIO=m
|
||
|
|
-CONFIG_I2C_MUX=m
|
||
|
|
-CONFIG_I2C_MUX_PCA954x=m
|
||
|
|
CONFIG_SPI=y
|
||
|
|
CONFIG_SPI_BCM2835=m
|
||
|
|
CONFIG_SPI_BCM2835AUX=m
|
||
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
||
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
||
|
|
@@ -73,7 +73,6 @@ CONFIG_INET=y
|
||
|
|
CONFIG_IP_MULTICAST=y
|
||
|
|
CONFIG_IP_ADVANCED_ROUTER=y
|
||
|
|
CONFIG_IP_MULTIPLE_TABLES=y
|
||
|
|
-CONFIG_IPV6_SUBTREES=y
|
||
|
|
CONFIG_IP_ROUTE_MULTIPATH=y
|
||
|
|
CONFIG_IP_ROUTE_VERBOSE=y
|
||
|
|
CONFIG_IP_PNP=y
|
||
|
|
@@ -95,12 +94,14 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
|
||
|
|
CONFIG_INET_XFRM_MODE_BEET=m
|
||
|
|
CONFIG_INET_LRO=m
|
||
|
|
CONFIG_INET_DIAG=m
|
||
|
|
+CONFIG_IPV6=m
|
||
|
|
CONFIG_IPV6_ROUTER_PREF=y
|
||
|
|
CONFIG_INET6_AH=m
|
||
|
|
CONFIG_INET6_ESP=m
|
||
|
|
CONFIG_INET6_IPCOMP=m
|
||
|
|
CONFIG_IPV6_TUNNEL=m
|
||
|
|
CONFIG_IPV6_MULTIPLE_TABLES=y
|
||
|
|
+CONFIG_IPV6_SUBTREES=y
|
||
|
|
CONFIG_IPV6_MROUTE=y
|
||
|
|
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
|
||
|
|
CONFIG_IPV6_PIMSM_V2=y
|
||
|
|
@@ -593,10 +594,9 @@ CONFIG_HW_RANDOM=y
|
||
|
|
CONFIG_RAW_DRIVER=y
|
||
|
|
CONFIG_I2C=y
|
||
|
|
CONFIG_I2C_CHARDEV=m
|
||
|
|
+CONFIG_I2C_MUX_PCA954x=m
|
||
|
|
CONFIG_I2C_BCM2708=m
|
||
|
|
CONFIG_I2C_GPIO=m
|
||
|
|
-CONFIG_I2C_MUX=m
|
||
|
|
-CONFIG_I2C_MUX_PCA954x=m
|
||
|
|
CONFIG_SPI=y
|
||
|
|
CONFIG_SPI_BCM2835=m
|
||
|
|
CONFIG_SPI_BCM2835AUX=m
|