summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-11 21:20:27 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-11 21:20:27 -0800
commitab889e6607f6e3d52a76c5a43c8c4ad1d354da36 (patch)
treebb98f2977e03bd2d4812ec5442e6cfb0e7678721 /net/batman-adv/main.c
parentdcf96f1ff66f328fecf1e14437ac73db71b08c03 (diff)
parent3878f1f075470990d9c2418b53f31694e774f743 (diff)
downloadop-kernel-dev-ab889e6607f6e3d52a76c5a43c8c4ad1d354da36.zip
op-kernel-dev-ab889e6607f6e3d52a76c5a43c8c4ad1d354da36.tar.gz
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r--net/batman-adv/main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index dc9248d..06d956c 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -30,7 +30,6 @@
#include "translation-table.h"
#include "hard-interface.h"
#include "gateway_client.h"
-#include "types.h"
#include "vis.h"
#include "hash.h"
OpenPOWER on IntegriCloud