From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 29 Aug 2012 12:54:17 +0000 (-0700)
Subject: [igb] uek2 fix driver merge
X-Git-Tag: v2.6.39-400.9.0~344
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a7bd8ecbe84656cdea76154afc105c85f528964c;p=users%2Fjedix%2Flinux-maple.git

[igb] uek2 fix driver merge

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/drivers/net/igb/kcompat.h b/drivers/net/igb/kcompat.h
index 553e1c0e03cd..9042a38dc8be 100644
--- a/drivers/net/igb/kcompat.h
+++ b/drivers/net/igb/kcompat.h
@@ -3011,14 +3011,10 @@ static inline void __kc_skb_frag_unref(skb_frag_t *frag)
 #endif
 
 /*****************************************************************************/
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) )
-typedef u32 netdev_features_t;
-#else /* ! < 3.3.0 */
 #define HAVE_INT_NDO_VLAN_RX_ADD_VID
 #ifdef ETHTOOL_SRXNTUPLE
 #undef ETHTOOL_SRXNTUPLE
 #endif
-#endif /* < 3.3.0 */
 
 /*****************************************************************************/
 #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) )