From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 4 Mar 2015 09:34:01 +0000 (+0200)
Subject: compat-2.6.29.h: Avoid include on kernels > 2.6.29
X-Git-Tag: vofed-3.18~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f794d43c566021703d743bed79c591838e09e812;p=~emulex%2Ftmp%2Fcompat%2F.git

compat-2.6.29.h: Avoid include on kernels > 2.6.29

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/include/linux/compat-2.6.29.h b/include/linux/compat-2.6.29.h
index b3833fe..5aa8d45 100644
--- a/include/linux/compat-2.6.29.h
+++ b/include/linux/compat-2.6.29.h
@@ -2,17 +2,10 @@
 #define LINUX_26_29_COMPAT_H
 
 #include <linux/version.h>
-#include <linux/netdevice.h>
-#include <linux/if_link.h>
-
-/*
- * I kow this looks odd.. but 2.6.32 added the netdev_tx_t
- * and we backport that there so inlcude that header first
- * as we need it for the netdev ops.
- */
-#include <linux/compat-2.6.32.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
+#include <linux/netdevice.h>
+#include <linux/if_link.h>
 
 #include <linux/skbuff.h>
 #include <linux/usb.h>