From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 26 Jun 2010 00:36:26 +0000 (+0200)
Subject: Staging: batman-adv: Allow to build it inside the kernel
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b06687993c41d0f5658bae6b0bff17c0caae08b6;p=linux.git

Staging: batman-adv: Allow to build it inside the kernel

We must use the user supplied information about how the code should be
compiled instead of always trying to build it as module.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile
index 654c4d2b97260..e9817b5a614c9 100644
--- a/drivers/staging/batman-adv/Makefile
+++ b/drivers/staging/batman-adv/Makefile
@@ -18,5 +18,5 @@
 # 02110-1301, USA
 #
 
-obj-m += batman-adv.o
+obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
 batman-adv-objs := main.o bat_debugfs.o bat_sysfs.o send.o routing.o soft-interface.o icmp_socket.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o