diff -urN linux-2.4.0t4/arch/arm/nwfpe/fpmodule.c linux/arch/arm/nwfpe/fpmodule.c --- linux-2.4.0t4/arch/arm/nwfpe/fpmodule.c Sun Feb 13 13:47:01 2000 +++ linux/arch/arm/nwfpe/fpmodule.c Fri Jul 14 09:27:09 2000 @@ -48,10 +48,8 @@ #ifdef MODULE int fp_printk(const char *,...); void fp_send_sig(unsigned long sig, PTASK p, int priv); -#if LINUX_VERSION_CODE > 0x20115 MODULE_AUTHOR("Scott Bambrough "); MODULE_DESCRIPTION("NWFPE floating point emulator"); -#endif #else #define fp_printk printk diff -urN linux-2.4.0t4/drivers/block/DAC960.h linux/drivers/block/DAC960.h --- linux-2.4.0t4/drivers/block/DAC960.h Sat May 20 13:55:25 2000 +++ linux/drivers/block/DAC960.h Fri Jul 14 09:27:09 2000 @@ -2340,19 +2340,6 @@ /* - Define compatibility macros between Linux 2.0 and Linux 2.1. -*/ - -#if LINUX_VERSION_CODE < 0x20100 - -#define MODULE_PARM(Variable, Type) -#define ioremap_nocache(Offset, Size) vremap(Offset, Size) -#define iounmap(Address) vfree(Address) - -#endif - - -/* Define prototypes for the forward referenced DAC960 Driver Internal Functions. */ diff -urN linux-2.4.0t4/drivers/char/bw-qcam.c linux/drivers/char/bw-qcam.c --- linux-2.4.0t4/drivers/char/bw-qcam.c Sat Oct 2 10:35:15 1999 +++ linux/drivers/char/bw-qcam.c Fri Jul 14 09:27:09 2000 @@ -84,10 +84,8 @@ static unsigned int maxpoll=250; /* Maximum busy-loop count for qcam I/O */ static unsigned int yieldlines=4; /* Yield after this many during capture */ -#if LINUX_VERSION_CODE >= 0x020117 MODULE_PARM(maxpoll,"i"); MODULE_PARM(yieldlines,"i"); -#endif extern __inline__ int read_lpstatus(struct qcam_device *q) { diff -urN linux-2.4.0t4/drivers/char/drm/drmP.h linux/drivers/char/drm/drmP.h --- linux-2.4.0t4/drivers/char/drm/drmP.h Thu Jul 6 09:39:51 2000 +++ linux/drivers/char/drm/drmP.h Fri Jul 14 09:27:09 2000 @@ -49,9 +49,7 @@ #ifdef CONFIG_MTRR #include #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) #include -#endif #include "drm.h" #define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then diff -urN linux-2.4.0t4/drivers/char/i2c-old.c linux/drivers/char/i2c-old.c --- linux-2.4.0t4/drivers/char/i2c-old.c Thu Dec 16 16:59:38 1999 +++ linux/drivers/char/i2c-old.c Fri Jul 14 09:27:09 2000 @@ -24,11 +24,9 @@ static int verbose = 0; static int i2c_debug = 0; -#if LINUX_VERSION_CODE >= 0x020117 MODULE_PARM(scan,"i"); MODULE_PARM(verbose,"i"); MODULE_PARM(i2c_debug,"i"); -#endif /* ----------------------------------------------------------------------- */ @@ -430,7 +428,6 @@ #ifdef MODULE -#if LINUX_VERSION_CODE >= 0x020100 EXPORT_SYMBOL(i2c_register_bus); EXPORT_SYMBOL(i2c_unregister_bus); EXPORT_SYMBOL(i2c_register_driver); @@ -445,7 +442,6 @@ EXPORT_SYMBOL(i2c_readbyte); EXPORT_SYMBOL(i2c_read); EXPORT_SYMBOL(i2c_write); -#endif int init_module(void) { diff -urN linux-2.4.0t4/drivers/char/pcxx.c linux/drivers/char/pcxx.c --- linux-2.4.0t4/drivers/char/pcxx.c Tue Jul 11 09:18:09 2000 +++ linux/drivers/char/pcxx.c Fri Jul 14 09:27:09 2000 @@ -114,7 +114,6 @@ static int altpin[] = {0, 0, 0, 0}; static int numports[] = {0, 0, 0, 0}; -# if (LINUX_VERSION_CODE > 0x020111) MODULE_AUTHOR("Bernhard Kaindl"); MODULE_DESCRIPTION("Digiboard PC/X{i,e,eve} driver"); MODULE_PARM(verbose, "i"); @@ -124,7 +123,6 @@ MODULE_PARM(memsize, "1-4i"); MODULE_PARM(altpin, "1-4i"); MODULE_PARM(numports, "1-4i"); -# endif #endif MODULE diff -urN linux-2.4.0t4/drivers/net/aironet4500_core.c linux/drivers/net/aironet4500_core.c --- linux-2.4.0t4/drivers/net/aironet4500_core.c Fri Jul 14 09:09:50 2000 +++ linux/drivers/net/aironet4500_core.c Fri Jul 14 09:27:09 2000 @@ -2560,8 +2560,6 @@ int awc_simple_bridge = 0; // int debug =0; -#if LINUX_VERSION_CODE >= 0x20100 - MODULE_PARM(awc_debug,"i"); MODULE_PARM(rx_queue_len,"i"); MODULE_PARM(tx_rate,"i"); @@ -2575,7 +2573,6 @@ MODULE_PARM(large_buff_mem,"i"); MODULE_PARM(small_buff_no,"i"); MODULE_PARM(SSID,"1-4c31"); -#endif /*EXPORT_SYMBOL(tx_queue_len); EXPORT_SYMBOL(awc_debug); diff -urN linux-2.4.0t4/drivers/net/arlan.c linux/drivers/net/arlan.c --- linux-2.4.0t4/drivers/net/arlan.c Fri Jul 14 09:09:50 2000 +++ linux/drivers/net/arlan.c Fri Jul 14 09:27:09 2000 @@ -44,7 +44,6 @@ static int mdebug = 0; #endif -#if LINUX_VERSION_CODE > 0x20100 MODULE_PARM(irq, "i"); MODULE_PARM(mem, "i"); MODULE_PARM(probe, "i"); @@ -76,15 +75,6 @@ // #warning kernel 2.1.110 tested #define myATOMIC_INIT(a,b) atomic_set(&(a),b) - -#else -#define test_and_set_bit set_bit -#if LINUX_VERSION_CODE != 0x20024 - // #warning kernel 2.0.36 tested -#endif -#define myATOMIC_INIT(a,b) a = b; - -#endif struct arlan_conf_stru arlan_conf[MAX_ARLANS]; int arlans_found = 0; diff -urN linux-2.4.0t4/drivers/net/dgrs.c linux/drivers/net/dgrs.c --- linux-2.4.0t4/drivers/net/dgrs.c Wed Jul 5 09:53:25 2000 +++ linux/drivers/net/dgrs.c Fri Jul 14 09:27:09 2000 @@ -98,22 +98,7 @@ #include -/* - * API changed at linux version 2.1.0 - */ -#if LINUX_VERSION_CODE >= 0x20100 - #include - #define IOREMAP(ADDR, LEN) ioremap(ADDR, LEN) - #define IOUNMAP(ADDR) iounmap(ADDR) - #define COPY_FROM_USER(DST,SRC,LEN) copy_from_user(DST,SRC,LEN) - #define COPY_TO_USER(DST,SRC,LEN) copy_to_user(DST,SRC,LEN) -#else - #include - #define IOREMAP(ADDR, LEN) vremap(ADDR, LEN) - #define IOUNMAP(ADDR) vfree(ADDR) - #define COPY_FROM_USER(DST,SRC,LEN) memcpy_fromfs(DST,SRC,LEN) - #define COPY_TO_USER(DST,SRC,LEN) memcpy_tofs(DST,SRC,LEN) -#endif +#include /* * DGRS include files @@ -308,7 +293,7 @@ /* * Now map the DMA registers into our virtual space */ - priv0->vplxdma = (ulong *) IOREMAP (priv0->plxdma, 256); + priv0->vplxdma = (ulong *) ioremap (priv0->plxdma, 256); if (!priv0->vplxdma) { printk("%s: can't *remap() the DMA regs\n", dev0->name); @@ -839,7 +824,7 @@ if (cmd != DGRSIOCTL) return -EINVAL; - if(COPY_FROM_USER(&ioc, ifr->ifr_data, sizeof(DGRS_IOCTL))) + if(copy_from_user(&ioc, ifr->ifr_data, sizeof(DGRS_IOCTL))) return -EFAULT; switch (ioc.cmd) @@ -847,7 +832,7 @@ case DGRS_GETMEM: if (ioc.len != sizeof(ulong)) return -EINVAL; - if(COPY_TO_USER(ioc.data, &devN->mem_start, ioc.len)) + if(copy_to_user(ioc.data, &devN->mem_start, ioc.len)) return -EFAULT; return (0); case DGRS_SETFILTER: @@ -876,7 +861,7 @@ if (ioc.len) { - if(COPY_FROM_USER(S2HN(privN->bcomm->bc_filter_area), + if(copy_from_user(S2HN(privN->bcomm->bc_filter_area), ioc.data, ioc.len)) return -EFAULT; privN->bcomm->bc_filter_cmd = BC_FILTER_SET; @@ -999,7 +984,7 @@ /* * Map in the dual port memory */ - priv0->vmem = IOREMAP(dev0->mem_start, 2048*1024); + priv0->vmem = ioremap(dev0->mem_start, 2048*1024); if (!priv0->vmem) { printk("%s: cannot map in board memory\n", dev0->name); @@ -1046,7 +1031,7 @@ memcpy(priv0->vmem, dgrs_code, dgrs_ncode); /* Load code */ if (memcmp(priv0->vmem, dgrs_code, dgrs_ncode)) { - IOUNMAP(priv0->vmem); + iounmap(priv0->vmem); priv0->vmem = NULL; printk("%s: download compare failed\n", dev0->name); return -ENXIO; @@ -1491,9 +1476,9 @@ proc_reset(priv->devtbl[0], 1); if (priv->vmem) - IOUNMAP(priv->vmem); + iounmap(priv->vmem); if (priv->vplxdma) - IOUNMAP((uchar *) priv->vplxdma); + iounmap((uchar *) priv->vplxdma); release_region(dgrs_root_dev->base_addr, 256); diff -urN linux-2.4.0t4/drivers/net/eth16i.c linux/drivers/net/eth16i.c --- linux-2.4.0t4/drivers/net/eth16i.c Wed Jul 5 09:53:26 2000 +++ linux/drivers/net/eth16i.c Fri Jul 14 09:27:09 2000 @@ -1407,7 +1407,6 @@ static char* mediatype[MAX_ETH16I_CARDS] = { 0, }; static int debug = -1; -#if (LINUX_VERSION_CODE >= 0x20115) MODULE_AUTHOR("Mika Kuoppala "); MODULE_DESCRIPTION("ICL EtherTeam 16i/32 driver"); @@ -1424,7 +1423,6 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "eth16i debug level (0-4)"); -#endif int init_module(void) { diff -urN linux-2.4.0t4/drivers/net/hamradio/soundmodem/sm_sbc.c linux/drivers/net/hamradio/soundmodem/sm_sbc.c --- linux-2.4.0t4/drivers/net/hamradio/soundmodem/sm_sbc.c Mon Mar 13 12:50:16 2000 +++ linux/drivers/net/hamradio/soundmodem/sm_sbc.c Fri Jul 14 09:27:09 2000 @@ -35,48 +35,8 @@ #include #include "sm.h" #include "smdma.h" - -/* --------------------------------------------------------------------- */ - -/* - * currently this module is supposed to support both module styles, i.e. - * the old one present up to about 2.1.9, and the new one functioning - * starting with 2.1.21. The reason is I have a kit allowing to compile - * this module also under 2.0.x which was requested by several people. - * This will go in 2.2 - */ #include - -#if LINUX_VERSION_CODE >= 0x20100 #include -#else -#include -#include - -#undef put_user -#undef get_user - -#define put_user(x,ptr) ({ __put_user((unsigned long)(x),(ptr),sizeof(*(ptr))); 0; }) -#define get_user(x,ptr) ({ x = ((__typeof__(*(ptr)))__get_user((ptr),sizeof(*(ptr)))); 0; }) - -extern inline int copy_from_user(void *to, const void *from, unsigned long n) -{ - int i = verify_area(VERIFY_READ, from, n); - if (i) - return i; - memcpy_fromfs(to, from, n); - return 0; -} - -extern inline int copy_to_user(void *to, const void *from, unsigned long n) -{ - int i = verify_area(VERIFY_WRITE, to, n); - if (i) - return i; - memcpy_tofs(to, from, n); - return 0; -} -#endif /* --------------------------------------------------------------------- */ diff -urN linux-2.4.0t4/drivers/net/hamradio/soundmodem/sm_wss.c linux/drivers/net/hamradio/soundmodem/sm_wss.c --- linux-2.4.0t4/drivers/net/hamradio/soundmodem/sm_wss.c Mon Mar 13 12:50:16 2000 +++ linux/drivers/net/hamradio/soundmodem/sm_wss.c Fri Jul 14 09:27:09 2000 @@ -34,48 +34,8 @@ #include #include "sm.h" #include "smdma.h" - -/* --------------------------------------------------------------------- */ - -/* - * currently this module is supposed to support both module styles, i.e. - * the old one present up to about 2.1.9, and the new one functioning - * starting with 2.1.21. The reason is I have a kit allowing to compile - * this module also under 2.0.x which was requested by several people. - * This will go in 2.2 - */ #include - -#if LINUX_VERSION_CODE >= 0x20100 #include -#else -#include -#include - -#undef put_user -#undef get_user - -#define put_user(x,ptr) ({ __put_user((unsigned long)(x),(ptr),sizeof(*(ptr))); 0; }) -#define get_user(x,ptr) ({ x = ((__typeof__(*(ptr)))__get_user((ptr),sizeof(*(ptr)))); 0; }) - -extern inline int copy_from_user(void *to, const void *from, unsigned long n) -{ - int i = verify_area(VERIFY_READ, from, n); - if (i) - return i; - memcpy_fromfs(to, from, n); - return 0; -} - -extern inline int copy_to_user(void *to, const void *from, unsigned long n) -{ - int i = verify_area(VERIFY_WRITE, to, n); - if (i) - return i; - memcpy_tofs(to, from, n); - return 0; -} -#endif /* --------------------------------------------------------------------- */ diff -urN linux-2.4.0t4/drivers/net/pcmcia/aironet4500_cs.c linux/drivers/net/pcmcia/aironet4500_cs.c --- linux-2.4.0t4/drivers/net/pcmcia/aironet4500_cs.c Tue Jul 11 09:18:14 2000 +++ linux/drivers/net/pcmcia/aironet4500_cs.c Fri Jul 14 09:27:09 2000 @@ -53,10 +53,7 @@ static u_int irq_mask = 0x5eF8; static int awc_ports[] = {0x140,0x100,0xc0, 0x80 }; -#if LINUX_VERSION_CODE > 0x20100 MODULE_PARM(irq_mask, "i"); - -#endif #define RUN_AT(x) (jiffies+(x)) diff -urN linux-2.4.0t4/drivers/net/rrunner.c linux/drivers/net/rrunner.c --- linux-2.4.0t4/drivers/net/rrunner.c Wed Jul 5 09:53:29 2000 +++ linux/drivers/net/rrunner.c Fri Jul 14 09:27:09 2000 @@ -260,10 +260,8 @@ #ifdef MODULE -#if LINUX_VERSION_CODE > 0x20118 MODULE_AUTHOR("Jes Sorensen "); MODULE_DESCRIPTION("Essential RoadRunner HIPPI driver"); -#endif int init_module(void) { diff -urN linux-2.4.0t4/drivers/sbus/char/envctrl.c linux/drivers/sbus/char/envctrl.c --- linux-2.4.0t4/drivers/sbus/char/envctrl.c Wed Jul 5 09:53:31 2000 +++ linux/drivers/sbus/char/envctrl.c Fri Jul 14 09:27:09 2000 @@ -32,11 +32,6 @@ #undef DEBUG #undef DEBUG_BUS_SCAN - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0) -#define schedule_timeout(a) { current->timeout = jiffies + (a); schedule(); } -#endif - #define PCF8584_ADDRESS 0x55 #define CONTROL_PIN 0x80 diff -urN linux-2.4.0t4/include/linux/lvm.h linux/include/linux/lvm.h --- linux-2.4.0t4/include/linux/lvm.h Wed May 24 21:38:26 2000 +++ linux/include/linux/lvm.h Fri Jul 14 09:27:09 2000 @@ -94,7 +94,7 @@ #include -#if LINUX_VERSION_CODE >= KERNEL_VERSION ( 2, 3 ,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) #include #else #include diff -urN linux-2.4.0t4/net/ipv6/af_inet6.c linux/net/ipv6/af_inet6.c --- linux-2.4.0t4/net/ipv6/af_inet6.c Wed Apr 26 15:13:17 2000 +++ linux/net/ipv6/af_inet6.c Fri Jul 14 09:27:09 2000 @@ -64,11 +64,9 @@ module for allowing unload */ #endif -#if defined(MODULE) && LINUX_VERSION_CODE > 0x20115 MODULE_AUTHOR("Cast of dozens"); MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); MODULE_PARM(unloadable, "i"); -#endif extern struct proto_ops inet6_stream_ops; extern struct proto_ops inet6_dgram_ops;