diff --git a/[refs] b/[refs]
index 4b6a2478a5f3..4e69bf83d53b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 149de2e58b53cb87c9637a46441c477f0caf74bd
+refs/heads/master: bc0ad071a788625abb23aee4cb3c07d17d501641
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
index 8abaa6193ac3..7dc9aef9bef4 100644
--- a/trunk/drivers/staging/batman-adv/routing.c
+++ b/trunk/drivers/staging/batman-adv/routing.c
@@ -35,8 +35,6 @@
 
 DECLARE_WAIT_QUEUE_HEAD(thread_wait);
 
-atomic_t exit_cond;
-
 void slide_own_bcast_window(struct batman_if *batman_if)
 {
 	HASHIT(hashit);
diff --git a/trunk/drivers/staging/batman-adv/routing.h b/trunk/drivers/staging/batman-adv/routing.h
index c217241d0efd..939b8d4f733c 100644
--- a/trunk/drivers/staging/batman-adv/routing.h
+++ b/trunk/drivers/staging/batman-adv/routing.h
@@ -22,7 +22,6 @@
 #include "types.h"
 
 extern wait_queue_head_t thread_wait;
-extern atomic_t exit_cond;
 
 void slide_own_bcast_window(struct batman_if *batman_if);
 void receive_bat_packet(struct ethhdr *ethhdr,