The following commit has been merged in the merge/master branch: commit ae07d9097a09e84d647535185de77bb210f968ce Author: Antonio Quartulli antonio@meshcoding.com Date: Sat Oct 12 17:21:04 2013 +0200
batman-adv: fix mistake in merge resolution
Signed-off-by: Antonio Quartulli antonio@meshcoding.com
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ff39e46..773301a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_
-#define BATADV_DRIVER_AUTHOR "Marek Lindner lindner_marek@yahoo.de, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner mareklindner@neomailbox.ch, " \ "Simon Wunderlich sw@simonwunderlich.de" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" @@ -174,7 +174,6 @@ enum batadv_uev_type { #include <linux/jiffies.h> #include <linux/seq_file.h> #include <linux/if_vlan.h> -#include "compat.h"
#include "types.h"