From 5127daf209aff80c3a8d4da0d66106b7cab9185a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 9 Dec 2014 05:40:14 +0000
Subject: [PATCH] net: Enable 6LOWPAN as module; re-enable BT_6LOWPAN and
 IEEE802154_6LOWPAN as modules

svn path=/dists/trunk/linux/; revision=22155
---
 debian/changelog     | 2 ++
 debian/config/config | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 75577bd10..676118632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * vfs: Enable OVERLAY_FS as module
   * drivers/base: Disable UEVENT_HELPER, only needed for compatibility
     with wheezy's udev package
+  * net: Enable 6LOWPAN as module; re-enable BT_6LOWPAN and
+    IEEE802154_6LOWPAN as modules
 
  -- 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 0146cf6c7..6b580d301 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5444,6 +5444,11 @@ CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=m
 CONFIG_WIRELESS=y
 
+##
+## file: net/6lowpan/Kconfig
+##
+CONFIG_6LOWPAN=m
+
 ##
 ## file: net/8021q/Kconfig
 ##
@@ -5484,7 +5489,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 ## file: net/bluetooth/Kconfig
 ##
 CONFIG_BT=m
-CONFIG_BT_6LOWPAN=y
+CONFIG_BT_6LOWPAN=m
 
 ##
 ## file: net/bluetooth/bnep/Kconfig