The following commit has been merged in the merge/master branch: commit 84f863520532ed2988726aad0cee78f19838ed13 Author: Sven Eckelmann sven@narfation.org Date: Wed May 11 08:16:47 2016 +0200

batman-adv: Remove unused include atomic.h

The only atomic_* function was removed in the bat_v.c and thus the include should also be removed.

Fixes: 71e957cd30a0 ("batman-adv: init ELP tweaking options only once") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 3c5d251..b9c2850 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -18,7 +18,6 @@ #include "bat_algo.h" #include "main.h"

-#include <linux/atomic.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h>