1 From 9efe69a81ab2f031cbfeccb2f606a241f155e6b5 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Tue, 12 Apr 2016 12:45:16 +0100
4 Subject: [PATCH] config: Make IPV6 a module and regenerate with defconfig
7 arch/arm/configs/bcm2709_defconfig | 4 ++--
8 arch/arm/configs/bcmrpi_defconfig | 6 +++---
9 2 files changed, 5 insertions(+), 5 deletions(-)
11 --- a/arch/arm/configs/bcm2709_defconfig
12 +++ b/arch/arm/configs/bcm2709_defconfig
13 @@ -101,6 +101,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
14 CONFIG_INET_XFRM_MODE_BEET=m
18 CONFIG_IPV6_ROUTER_PREF=y
21 @@ -600,10 +601,9 @@ CONFIG_HW_RANDOM=y
25 +CONFIG_I2C_MUX_PCA954x=m
29 -CONFIG_I2C_MUX_PCA954x=m
32 CONFIG_SPI_BCM2835AUX=m
33 --- a/arch/arm/configs/bcmrpi_defconfig
34 +++ b/arch/arm/configs/bcmrpi_defconfig
35 @@ -73,7 +73,6 @@ CONFIG_INET=y
37 CONFIG_IP_ADVANCED_ROUTER=y
38 CONFIG_IP_MULTIPLE_TABLES=y
39 -CONFIG_IPV6_SUBTREES=y
40 CONFIG_IP_ROUTE_MULTIPATH=y
41 CONFIG_IP_ROUTE_VERBOSE=y
43 @@ -95,12 +94,14 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m
44 CONFIG_INET_XFRM_MODE_BEET=m
48 CONFIG_IPV6_ROUTER_PREF=y
53 CONFIG_IPV6_MULTIPLE_TABLES=y
54 +CONFIG_IPV6_SUBTREES=y
56 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
57 CONFIG_IPV6_PIMSM_V2=y
58 @@ -593,10 +594,9 @@ CONFIG_HW_RANDOM=y
62 +CONFIG_I2C_MUX_PCA954x=m
66 -CONFIG_I2C_MUX_PCA954x=m
69 CONFIG_SPI_BCM2835AUX=m