[kernel] r17220 - in dists/sid/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Wed Apr 13 04:37:19 2011
New Revision: 17220

Log:
net: Enable BATMAN_ADV as module (Closes: #622361)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Apr 13 04:34:22 2011	(r17219)
+++ dists/sid/linux-2.6/debian/changelog	Wed Apr 13 04:37:19 2011	(r17220)
@@ -3,6 +3,7 @@
   [ 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 at decadent.org.uk>  Fri, 08 Apr 2011 00:59:57 +0100
 

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Wed Apr 13 04:34:22 2011	(r17219)
+++ dists/sid/linux-2.6/debian/config/config	Wed Apr 13 04:37:19 2011	(r17220)
@@ -2415,11 +2415,6 @@
 CONFIG_AUTOFS_FS=m
 
 ##
-## file: drivers/staging/batman-adv/Kconfig
-##
-# CONFIG_BATMAN_ADV is not set
-
-##
 ## file: drivers/staging/comedi/Kconfig
 ##
 # CONFIG_COMEDI is not set
@@ -3685,6 +3680,11 @@
 # CONFIG_NET_9P_DEBUG is not set
 
 ##
+## file: net/batman-adv/Kconfig
+##
+CONFIG_BATMAN_ADV=m
+
+##
 ## file: net/bluetooth/Kconfig
 ##
 CONFIG_BT=m