diff --git a/[refs] b/[refs]
index 88d193b45e52..5745dfa02c0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a837af5fbaf8a1a6d7ff2e8f4ec056e0675f373
+refs/heads/master: 8996ba139e3a09ef58e170ecc807a25a879ab6ec
diff --git a/trunk/drivers/staging/batman-adv/Makefile b/trunk/drivers/staging/batman-adv/Makefile
index 4b5c4349cdc5..78924283ea74 100644
--- a/trunk/drivers/staging/batman-adv/Makefile
+++ b/trunk/drivers/staging/batman-adv/Makefile
@@ -19,4 +19,4 @@
 #
 
 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 unicast.o
+batman-adv-y := 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 unicast.o