The following commit has been merged in the maint branch: commit dc130a61a0cc606f8009cdc013b838e71d73c4fa Author: Linus Lüssing linus.luessing@ascom.ch Date: Sun Feb 6 23:08:39 2011 +0000

batman-adv: Switch order of types.h and compat.h inclusion

The compat.h changes should be transparent for any other of our source files - even for types.h. Therefore switching the order.

Signed-off-by: Linus Lüssing linus.luessing@ascom.ch Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/main.h b/main.h index f66a74d..9292214 100644 --- a/main.h +++ b/main.h @@ -114,10 +114,10 @@ #include <net/sock.h> /* struct sock */ #include <linux/jiffies.h> #include <linux/seq_file.h> -#include "types.h" - #include "compat.h"

+#include "types.h" + #ifndef REVISION_VERSION #define REVISION_VERSION_STR "" #else