brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/staging/lynxis/omap.git] / target / linux / brcm2708 / patches-3.10 / 0129-config-Add-CONFIG_IPV6_TUNNEL.patch

diff --git a/target/linux/brcm2708/patches-3.10/0129-config-Add-CONFIG_IPV6_TUNNEL.patch b/target/linux/brcm2708/patches-3.10/0129-config-Add-CONFIG_IPV6_TUNNEL.patch
index f7a43b42b9c89e6d72f01f1d6cd67f880e7d3c4e..77fb121e53486e613b167d3a716a2eaad9a76dfd 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0129-config-Add-CONFIG_IPV6_TUNNEL.patch
+++ b/target/linux/brcm2708/patches-3.10/0129-config-Add-CONFIG_IPV6_TUNNEL.patch
@@ -1,13 +1,15 @@
-From 962104e8624908c51af0bdea615a12beb348ba96 Mon Sep 17 00:00:00 2001
+From 1c59b0bba59d5eb80018aad1a5207c9379516e87 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 18 Dec 2013 22:52:07 +0000
-Subject: [PATCH 129/174] config: Add CONFIG_IPV6_TUNNEL See:
+Subject: [PATCH 129/196] config: Add CONFIG_IPV6_TUNNEL See:
  https://github.com/raspberrypi/linux/issues/464
 
 ---
  arch/arm/configs/bcmrpi_defconfig | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index fd3229a..c9bcc7e 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -95,6 +95,7 @@ CONFIG_IPV6_PRIVACY=y
@@ -18,3 +20,6 @@ Subject: [PATCH 129/174] config: Add CONFIG_IPV6_TUNNEL See:
  CONFIG_IPV6_MULTIPLE_TABLES=y
  CONFIG_IPV6_MROUTE=y
  CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+-- 
+1.9.1
+