summaryrefslogtreecommitdiff
path: root/drivers/staging/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven.eckelmann@gmx.de>2010-06-26 00:36:26 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-08 19:22:31 (GMT)
commitb06687993c41d0f5658bae6b0bff17c0caae08b6 (patch)
tree51559d3a174857ca947d29c8595ec6c1ae5b0c11 /drivers/staging/batman-adv
parent08f20b5e07d17c36a6790fa8b0f2554b6735cf59 (diff)
downloadlinux-fsl-qoriq-b06687993c41d0f5658bae6b0bff17c0caae08b6.tar.xz
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>
Diffstat (limited to 'drivers/staging/batman-adv')
-rw-r--r--drivers/staging/batman-adv/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile
index 654c4d2..e9817b5 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