---

yaml --- r: 205768 b: refs/heads/master c: b066879 h: refs/heads/master v: v3
git-mirror · Jul 8, 2010 · 386a2c4 · 386a2c4
1 parent 63a573a
commit 386a2c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08f20b5e07d17c36a6790fa8b0f2554b6735cf59
+refs/heads/master: b06687993c41d0f5658bae6b0bff17c0caae08b6
diff --git a/trunk/drivers/staging/batman-adv/Makefile b/trunk/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