The following commit has been merged in the linux branch: commit 2e5806ba9647648ece9dd6e1fb6cbc0f875c662e Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat Jun 26 02:17:25 2010 +0200

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

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