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

svn path=/dists/sid/linux-2.6/; revision=17220
This commit is contained in:
Ben Hutchings 2011-04-13 04:37:19 +00:00
parent d208418ac3
commit 7fcb4ff12c
2 changed files with 6 additions and 5 deletions

1
debian/changelog vendored
View File

@ -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

10
debian/config/config vendored
View File

@ -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
##