From 7fcb4ff12cfe1eef6c305d05b273c18f465f99c8 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 13 Apr 2011 04:37:19 +0000
Subject: [PATCH] net: Enable BATMAN_ADV as module (Closes: #622361)

svn path=/dists/sid/linux-2.6/; revision=17220
---
 debian/changelog     |  1 +
 debian/config/config | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5cb6f592..e300cb202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-2.6 (2.6.38-4) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * usb-audio: Define another USB ID for a buggy USB MIDI cable
     (Closes: #617743)
+  * net: Enable BATMAN_ADV as module (Closes: #622361)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 08 Apr 2011 00:59:57 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 32c0f0fdc..06977e691 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2414,11 +2414,6 @@ CONFIG_STAGING=y
 ##
 CONFIG_AUTOFS_FS=m
 
-##
-## file: drivers/staging/batman-adv/Kconfig
-##
-# CONFIG_BATMAN_ADV is not set
-
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
@@ -3684,6 +3679,11 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 
+##
+## file: net/batman-adv/Kconfig
+##
+CONFIG_BATMAN_ADV=m
+
 ##
 ## file: net/bluetooth/Kconfig
 ##