The following commit has been merged in the next branch: commit 881efd508c3e6dca3a41683bb8cf243bf879c1af Author: Jesper Juhl jj@chaosbits.net Date: Mon Feb 14 23:38:18 2011 +0100

batman-adv: Remove two duplicate includes.

Remove duplicate inclusion of "send.h" and "routing.h" from soft-interface.c

Signed-off-by: Jesper Juhl jj@chaosbits.net Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/soft-interface.c b/soft-interface.c index bd088f8..7e37077 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -29,14 +29,12 @@ #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" -#include "send.h" #include "bat_sysfs.h" #include <linux/slab.h> #include <linux/ethtool.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> #include "unicast.h" -#include "routing.h"

static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);