From b06687993c41d0f5658bae6b0bff17c0caae08b6 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 26 Jun 2010 02:36:26 +0200 Subject: [PATCH 225/524] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/batman-adv/Makefile | 2 +- 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 -- 1.7.1