From 8ba6ebe359c5a5297627b41e646718683f375fd2 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 9 Dec 2014 05:45:04 +0000
Subject: [PATCH] net: Enable GENEVE as module; enable OPENVSWITCH_GENEVE

svn path=/dists/trunk/linux/; revision=22156
---
 debian/changelog     | 1 +
 debian/config/config | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 676118632..0b6c9517a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
     with wheezy's udev package
   * net: Enable 6LOWPAN as module; re-enable BT_6LOWPAN and
     IEEE802154_6LOWPAN as modules
+  * net: Enable GENEVE as module; enable OPENVSWITCH_GENEVE
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
diff --git a/debian/config/config b/debian/config/config
index 6b580d301..f7fbb9287 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5629,6 +5629,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
+CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -5992,6 +5993,7 @@ CONFIG_NFC_DIGITAL=m
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_OPENVSWITCH_GENEVE=y
 
 ##
 ## file: net/packet/Kconfig