[kernel] Enable batman-adv and add it to the list of "extra" modules

[John W. Linville]

commit 629ee7b23505420ffa4d11abde7bb51e2536bb5e
Author: John W. Linville <linville at tuxdriver.com>
Date:   Tue Jul 31 14:29:05 2012 -0400

    Enable batman-adv and add it to the list of "extra" modules

 config-generic |    2 +-
 kernel.spec    |    3 +++
 mod-extra.list |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index 8ae2916..80ada65 100644
--- a/config-generic
+++ b/config-generic
@@ -4240,7 +4240,7 @@ CONFIG_USB_ATMEL=m
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_R8187SE is not set
 # CONFIG_RTL8192U is not set
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
 # CONFIG_FB_SM7XX is not set
 # CONFIG_SPECTRA is not set
 # CONFIG_ZRAM is not set
diff --git a/kernel.spec b/kernel.spec
index 2b39e4a..5ca5ca5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2288,6 +2288,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jul 31 2012 John W. Linville <linville at redhat.com>
+- Enable batman-adv and add it to the list of "extra" modules
+
 * Tue Jul 31 2012 Dave Jones <davej at redhat.com>
 - Change VM_BUG_ON's to be WARN_ONs instead.
 
diff --git a/mod-extra.list b/mod-extra.list
index 4becf4d..c35fb62 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -171,3 +171,4 @@ tpm_nsc.ko
 tpm_tis.ko
 slip.ko
 nilfs2.ko
+batman-adv.ko