diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/wan/sdla_fr.c linux-2.5/drivers/net/wan/sdla_fr.c --- bk-linus/drivers/net/wan/sdla_fr.c 2002-11-21 02:17:16.000000000 +0000 +++ linux-2.5/drivers/net/wan/sdla_fr.c 2002-11-21 18:00:02.000000000 +0000 @@ -162,14 +162,9 @@ #include <linux/sdla_fr.h> /* frame relay firmware API definitions */ -#if defined(LINUX_2_1) || defined(LINUX_2_4) - #include <asm/uaccess.h> - #include <linux/inetdevice.h> - #include <linux/netdevice.h> - -#else - #include <asm/segment.h> -#endif +#include <asm/uaccess.h> +#include <linux/inetdevice.h> +#include <linux/netdevice.h> #include <net/route.h> /* Dynamic Route Creation */ #include <linux/etherdevice.h> /* eth_type_trans() used for bridging */