diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-12 00:20:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-12 00:20:27 -0500 |
| commit | ab889e6607f6e3d52a76c5a43c8c4ad1d354da36 (patch) | |
| tree | bb98f2977e03bd2d4812ec5442e6cfb0e7678721 /net/batman-adv/translation-table.c | |
| parent | dcf96f1ff66f328fecf1e14437ac73db71b08c03 (diff) | |
| parent | 3878f1f075470990d9c2418b53f31694e774f743 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/translation-table.c')
| -rw-r--r-- | net/batman-adv/translation-table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f6917dde42ce..7fb6726ccbdd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include "main.h" | 22 | #include "main.h" |
| 23 | #include "translation-table.h" | 23 | #include "translation-table.h" |
| 24 | #include "soft-interface.h" | 24 | #include "soft-interface.h" |
| 25 | #include "types.h" | ||
| 26 | #include "hash.h" | 25 | #include "hash.h" |
| 27 | #include "originator.h" | 26 | #include "originator.h" |
| 28 | 27 | ||