[PATCH] remove 2.2 bits fromw anpipe

diff --git a/include/linux/if_wanpipe.h b/include/linux/if_wanpipe.h
index c4cd29a162fedc9a5c235d12fb995c4049b41844..1279d330e4a8cefdb3ca48834206d9edd4276645 100644 (file)
--- a/include/linux/if_wanpipe.h
+++ b/include/linux/if_wanpipe.h
@@ -100,13 +100,9 @@ typedef struct
 #define WAN_PACKET_MR_ALLMULTI 2
 
 #ifdef __KERNEL__
+
 #ifndef netdevice_t
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
- #define netdevice_t struct net_device
-#else
- #define netdevice_t struct device
-#endif
+#define netdevice_t struct net_device
 #endif
 
 /* Private wanpipe socket structures. */

diff --git a/include/linux/if_wanpipe_common.h b/include/linux/if_wanpipe_common.h
index 28fefe071078fc102fa3265f1770688945605fc3..7fbbb9cc92c12329edc644d9504ebc5b1edfcf34 100644 (file)
--- a/include/linux/if_wanpipe_common.h
+++ b/include/linux/if_wanpipe_common.h
@@ -19,11 +19,7 @@
 
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
- #define netdevice_t struct net_device
-#else
- #define netdevice_t struct device
-#endif
+#define netdevice_t struct net_device
 
 
 typedef struct {