summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2003-03-06 01:41:42 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-03-06 01:41:42 -0800
commit53e2eed2d2021ace8fcaffa33aa8247b12fcaeeb (patch)
tree83219e609db40cf6ef5611eb65b39773cb89280a /include
parent8dc6c2849bf9291f23c5ebfddf2c1a036c45a70c (diff)
[PATCH] remove 2.2 bits fromw anpipe
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_wanpipe.h8
-rw-r--r--include/linux/if_wanpipe_common.h6
2 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/if_wanpipe.h b/include/linux/if_wanpipe.h
index c4cd29a162fe..1279d330e4a8 100644
--- 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 28fefe071078..7fbbb9cc92c1 100644
--- 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 {