[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:00 CEST 2011

The following commit has been merged in the master branch:
commit 8d689218568174955129d0f0e9e4370a391b3609
Author: Jesper Juhl <jj at 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
    Signed-off-by: Jesper Juhl <jj at chaosbits.net>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index bd088f8..7e37077 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/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);


More information about the linux-merge mailing list