From 7feb0dd257808c9451b22617b3935912839f1131 Mon Sep 17 00:00:00 2001
From: Simon Arlott <simon@fire.lp0.eu>
Date: Sun, 16 Dec 2012 06:47:50 +0000
Subject: [PATCH] --- yaml --- r: 347304 b: refs/heads/master c:
 df4841910758227cfc07ae645de781d687b3b215 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv6/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c97cf110936..464d7fd620a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14
+refs/heads/master: df4841910758227cfc07ae645de781d687b3b215
diff --git a/trunk/net/ipv6/Makefile b/trunk/net/ipv6/Makefile
index 2068ac4fbdad..4ea244891b58 100644
--- a/trunk/net/ipv6/Makefile
+++ b/trunk/net/ipv6/Makefile
@@ -41,6 +41,6 @@ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
 obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
 
 obj-y += addrconf_core.o exthdrs_core.o
-obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6_offload)
+obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
 
 obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o