From: Olaf Hering <olh@suse.de>
changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
remove code for obsolete kernels in acenic, irda, tokenring, typhoon and
wireless.
drivers/net/wan/farsync.c has fstioc_info->kernelVersion, according to the
comment the content doesnt matter
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/net/acenic.c | 11 ----
drivers/net/acenic.h | 4 -
drivers/net/b44.c | 1
drivers/net/dm9000.c | 1
drivers/net/gianfar.c | 1
drivers/net/gianfar.h | 1
drivers/net/gianfar_ethtool.c | 1
drivers/net/gianfar_phy.c | 1
drivers/net/hp100.c | 1
drivers/net/ibmveth.c | 1
drivers/net/irda/sir_kthread.c | 4 -
drivers/net/irda/vlsi_ir.h | 22 ---------
drivers/net/iseries_veth.c | 1
drivers/net/mac8390.c | 1
drivers/net/mv643xx_eth.h | 1
drivers/net/s2io.c | 1
drivers/net/sk98lin/h/skdrv1st.h | 3 -
drivers/net/sk_mca.c | 1
drivers/net/sk_mca.h | 2
drivers/net/starfire.c | 3 -
drivers/net/tokenring/lanstreamer.c | 59 --------------------------
drivers/net/tokenring/lanstreamer.h | 14 ------
drivers/net/typhoon.c | 9 ---
drivers/net/via-velocity.c | 1
drivers/net/wan/farsync.c | 2
drivers/net/wireless/orinoco.h | 1
drivers/net/wireless/prism54/isl_38xx.c | 1
drivers/net/wireless/prism54/isl_38xx.h | 1
drivers/net/wireless/prism54/isl_ioctl.c | 1
drivers/net/wireless/prism54/islpci_dev.c | 1
drivers/net/wireless/prism54/islpci_dev.h | 1
drivers/net/wireless/prism54/islpci_eth.c | 1
drivers/net/wireless/prism54/islpci_hotplug.c | 1
33 files changed, 5 insertions(+), 150 deletions(-)
diff -puN drivers/net/acenic.c~remove-linux-versionh-from-drivers-net drivers/net/acenic.c
--- devel/drivers/net/acenic.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/acenic.c 2005-07-12 15:21:38.000000000 -0700
@@ -53,7 +53,6 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
@@ -164,12 +163,6 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl)
#define SET_NETDEV_DEV(net, pdev) do{} while(0)
#endif
-#if LINUX_VERSION_CODE >= 0x2051c
-#define ace_sync_irq(irq) synchronize_irq(irq)
-#else
-#define ace_sync_irq(irq) synchronize_irq()
-#endif
-
#ifndef offset_in_page
#define offset_in_page(ptr) ((unsigned long)(ptr) & ~PAGE_MASK)
#endif
@@ -657,7 +650,7 @@ static void __devexit acenic_remove_one(
* Then release the RX buffers - jumbo buffers were
* already released in ace_close().
*/
- ace_sync_irq(dev->irq);
+ synchronize_irq(dev->irq);
for (i = 0; i < RX_STD_RING_ENTRIES; i++) {
struct sk_buff *skb = ap->skb->rx_std_skbuff[i].skb;
@@ -2657,7 +2650,7 @@ static int ace_change_mtu(struct net_dev
}
} else {
while (test_and_set_bit(0, &ap->jumbo_refill_busy));
- ace_sync_irq(dev->irq);
+ synchronize_irq(dev->irq);
ace_set_rxtx_parms(dev, 0);
if (ap->jumbo) {
struct cmd cmd;
diff -puN drivers/net/acenic.h~remove-linux-versionh-from-drivers-net drivers/net/acenic.h
--- devel/drivers/net/acenic.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/acenic.h 2005-07-12 15:21:38.000000000 -0700
@@ -1,8 +1,6 @@
#ifndef _ACENIC_H_
#define _ACENIC_H_
-#include <linux/config.h>
-
/*
* Generate TX index update each time, when TX ring is closed.
* Normally, this is not useful, because results in more dma (and irqs
@@ -747,7 +745,7 @@ static inline void ace_mask_irq(struct n
else
writel(readl(®s->HostCtrl) | MASK_INTS, ®s->HostCtrl);
- ace_sync_irq(dev->irq);
+ synchronize_irq(dev->irq);
}
diff -puN drivers/net/b44.c~remove-linux-versionh-from-drivers-net drivers/net/b44.c
--- devel/drivers/net/b44.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/b44.c 2005-07-12 15:21:38.000000000 -0700
@@ -18,7 +18,6 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/init.h>
-#include <linux/version.h>
#include <asm/uaccess.h>
#include <asm/io.h>
diff -puN drivers/net/dm9000.c~remove-linux-versionh-from-drivers-net drivers/net/dm9000.c
--- devel/drivers/net/dm9000.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/dm9000.c 2005-07-12 15:21:38.000000000 -0700
@@ -56,7 +56,6 @@
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/skbuff.h>
-#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/crc32.h>
#include <linux/mii.h>
diff -puN drivers/net/gianfar.c~remove-linux-versionh-from-drivers-net drivers/net/gianfar.c
--- devel/drivers/net/gianfar.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/gianfar.c 2005-07-12 15:21:38.000000000 -0700
@@ -94,7 +94,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/dma-mapping.h>
#include <linux/crc32.h>
diff -puN drivers/net/gianfar_ethtool.c~remove-linux-versionh-from-drivers-net drivers/net/gianfar_ethtool.c
--- devel/drivers/net/gianfar_ethtool.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/gianfar_ethtool.c 2005-07-12 15:21:38.000000000 -0700
@@ -34,7 +34,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <asm/types.h>
#include <asm/uaccess.h>
diff -puN drivers/net/gianfar.h~remove-linux-versionh-from-drivers-net drivers/net/gianfar.h
--- devel/drivers/net/gianfar.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/gianfar.h 2005-07-12 15:21:38.000000000 -0700
@@ -43,7 +43,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <linux/workqueue.h>
#include <linux/ethtool.h>
diff -puN drivers/net/gianfar_phy.c~remove-linux-versionh-from-drivers-net drivers/net/gianfar_phy.c
--- devel/drivers/net/gianfar_phy.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/gianfar_phy.c 2005-07-12 15:21:38.000000000 -0700
@@ -36,7 +36,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <linux/mii.h>
diff -puN drivers/net/hp100.c~remove-linux-versionh-from-drivers-net drivers/net/hp100.c
--- devel/drivers/net/hp100.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/hp100.c 2005-07-12 15:21:38.000000000 -0700
@@ -96,7 +96,6 @@
#undef HP100_MULTICAST_FILTER /* Need to be debugged... */
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff -puN drivers/net/ibmveth.c~remove-linux-versionh-from-drivers-net drivers/net/ibmveth.c
--- devel/drivers/net/ibmveth.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/ibmveth.c 2005-07-12 15:21:38.000000000 -0700
@@ -35,7 +35,6 @@
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
diff -puN drivers/net/irda/sir_kthread.c~remove-linux-versionh-from-drivers-net drivers/net/irda/sir_kthread.c
--- devel/drivers/net/irda/sir_kthread.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/irda/sir_kthread.c 2005-07-12 15:21:38.000000000 -0700
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/completion.h>
@@ -140,9 +139,6 @@ static int irda_thread(void *startup)
run_irda_queue();
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,35)
- reparent_to_init();
-#endif
complete_and_exit(&irda_rq_queue.exit, 0);
/* never reached */
return 0;
diff -puN drivers/net/irda/vlsi_ir.h~remove-linux-versionh-from-drivers-net drivers/net/irda/vlsi_ir.h
--- devel/drivers/net/irda/vlsi_ir.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/irda/vlsi_ir.h 2005-07-12 15:21:38.000000000 -0700
@@ -49,26 +49,6 @@ typedef void irqreturn_t;
#define IRQ_RETVAL(x)
#endif
-/* some stuff need to check kernelversion. Not all 2.5 stuff was present
- * in early 2.5.x - the test is merely to separate 2.4 from 2.5
- */
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-/* PDE() introduced in 2.5.4 */
-#ifdef CONFIG_PROC_FS
-#define PDE(inode) ((inode)->u.generic_ip)
-#endif
-
-/* irda crc16 calculation exported in 2.5.42 */
-#define irda_calc_crc16(fcs,buf,len) (GOOD_FCS)
-
-/* we use this for unified pci device name access */
-#define PCIDEV_NAME(pdev) ((pdev)->name)
-
-#else /* 2.5 or later */
-
/* recent 2.5/2.6 stores pci device names at varying places ;-) */
#ifdef CONFIG_PCI_NAMES
/* human readable name */
@@ -78,8 +58,6 @@ typedef void irqreturn_t;
#define PCIDEV_NAME(pdev) (pci_name(pdev))
#endif
-#endif
-
/* ================================================================ */
/* non-standard PCI registers */
diff -puN drivers/net/iseries_veth.c~remove-linux-versionh-from-drivers-net drivers/net/iseries_veth.c
--- devel/drivers/net/iseries_veth.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/iseries_veth.c 2005-07-12 15:21:38.000000000 -0700
@@ -57,7 +57,6 @@
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/ioport.h>
diff -puN drivers/net/mac8390.c~remove-linux-versionh-from-drivers-net drivers/net/mac8390.c
--- devel/drivers/net/mac8390.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/mac8390.c 2005-07-12 15:21:38.000000000 -0700
@@ -15,7 +15,6 @@
* and fixed access to Sonic Sys card which masquerades as a Farallon
* by rayk@knightsmanor.org */
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
diff -puN drivers/net/mv643xx_eth.h~remove-linux-versionh-from-drivers-net drivers/net/mv643xx_eth.h
--- devel/drivers/net/mv643xx_eth.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/mv643xx_eth.h 2005-07-12 15:21:38.000000000 -0700
@@ -1,7 +1,6 @@
#ifndef __MV643XX_ETH_H__
#define __MV643XX_ETH_H__
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
diff -puN drivers/net/s2io.c~remove-linux-versionh-from-drivers-net drivers/net/s2io.c
--- devel/drivers/net/s2io.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/s2io.c 2005-07-12 15:21:38.000000000 -0700
@@ -54,7 +54,6 @@
#include <linux/timex.h>
#include <linux/sched.h>
#include <linux/ethtool.h>
-#include <linux/version.h>
#include <linux/workqueue.h>
#include <asm/io.h>
diff -puN drivers/net/sk98lin/h/skdrv1st.h~remove-linux-versionh-from-drivers-net drivers/net/sk98lin/h/skdrv1st.h
--- devel/drivers/net/sk98lin/h/skdrv1st.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/sk98lin/h/skdrv1st.h 2005-07-12 15:21:38.000000000 -0700
@@ -39,9 +39,6 @@
#ifndef __INC_SKDRV1ST_H
#define __INC_SKDRV1ST_H
-/* Check kernel version */
-#include <linux/version.h>
-
typedef struct s_AC SK_AC;
/* Set card versions */
diff -puN drivers/net/sk_mca.c~remove-linux-versionh-from-drivers-net drivers/net/sk_mca.c
--- devel/drivers/net/sk_mca.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/sk_mca.c 2005-07-12 15:21:38.000000000 -0700
@@ -93,7 +93,6 @@ History:
#include <linux/mca-legacy.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
diff -puN drivers/net/sk_mca.h~remove-linux-versionh-from-drivers-net drivers/net/sk_mca.h
--- devel/drivers/net/sk_mca.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/sk_mca.h 2005-07-12 15:21:38.000000000 -0700
@@ -1,5 +1,3 @@
-#include <linux/version.h>
-
#ifndef _SK_MCA_INCLUDE_
#define _SK_MCA_INCLUDE_
diff -puN drivers/net/starfire.c~remove-linux-versionh-from-drivers-net drivers/net/starfire.c
--- devel/drivers/net/starfire.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/starfire.c 2005-07-12 15:21:38.000000000 -0700
@@ -143,7 +143,6 @@ TODO: - fix forced speed/duplexing code
#define DRV_RELDATE "January 19, 2005"
#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
@@ -257,7 +256,7 @@ static int full_duplex[MAX_UNITS] = {0,
* This SUCKS.
* We need a much better method to determine if dma_addr_t is 64-bit.
*/
-#if (defined(__i386__) && defined(CONFIG_HIGHMEM) && (LINUX_VERSION_CODE > 0x20500 || defined(CONFIG_HIGHMEM64G))) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
+#if (defined(__i386__) && defined(CONFIG_HIGHMEM)) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
/* 64-bit dma_addr_t */
#define ADDR_64BITS /* This chip uses 64 bit addresses. */
#define cpu_to_dma(x) cpu_to_le64(x)
diff -puN drivers/net/tokenring/lanstreamer.c~remove-linux-versionh-from-drivers-net drivers/net/tokenring/lanstreamer.c
--- devel/drivers/net/tokenring/lanstreamer.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/tokenring/lanstreamer.c 2005-07-12 15:21:38.000000000 -0700
@@ -120,7 +120,6 @@
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <linux/spinlock.h>
-#include <linux/version.h>
#include <linux/bitops.h>
#include <net/checksum.h>
@@ -1932,64 +1931,6 @@ static int sprintf_info(char *buffer, st
#endif
#endif
-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int streamer_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
- int i;
- struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
- u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-
- switch(cmd) {
- case IOCTL_SISR_MASK:
- writew(SISR_MI, streamer_mmio + SISR_MASK_SUM);
- break;
- case IOCTL_SPIN_LOCK_TEST:
- printk(KERN_INFO "spin_lock() called.\n");
- spin_lock(&streamer_priv->streamer_lock);
- spin_unlock(&streamer_priv->streamer_lock);
- printk(KERN_INFO "spin_unlock() finished.\n");
- break;
- case IOCTL_PRINT_BDAS:
- printk(KERN_INFO "bdas: RXBDA: %x RXLBDA: %x TX2FDA: %x TX2LFDA: %x\n",
- readw(streamer_mmio + RXBDA),
- readw(streamer_mmio + RXLBDA),
- readw(streamer_mmio + TX2FDA),
- readw(streamer_mmio + TX2LFDA));
- break;
- case IOCTL_PRINT_REGISTERS:
- printk(KERN_INFO "registers:\n");
- printk(KERN_INFO "SISR: %04x MISR: %04x LISR: %04x BCTL: %04x BMCTL: %04x\nmask %04x mask %04x\n",
- readw(streamer_mmio + SISR),
- readw(streamer_mmio + MISR_RUM),
- readw(streamer_mmio + LISR),
- readw(streamer_mmio + BCTL),
- readw(streamer_mmio + BMCTL_SUM),
- readw(streamer_mmio + SISR_MASK),
- readw(streamer_mmio + MISR_MASK));
- break;
- case IOCTL_PRINT_RX_BUFS:
- printk(KERN_INFO "Print rx bufs:\n");
- for(i=0; i<STREAMER_RX_RING_SIZE; i++)
- printk(KERN_INFO "rx_ring %d status: 0x%x\n", i,
- streamer_priv->streamer_rx_ring[i].status);
- break;
- case IOCTL_PRINT_TX_BUFS:
- printk(KERN_INFO "Print tx bufs:\n");
- for(i=0; i<STREAMER_TX_RING_SIZE; i++)
- printk(KERN_INFO "tx_ring %d status: 0x%x\n", i,
- streamer_priv->streamer_tx_ring[i].status);
- break;
- case IOCTL_RX_CMD:
- streamer_rx(dev);
- printk(KERN_INFO "Sent rx command.\n");
- break;
- default:
- printk(KERN_INFO "Bad ioctl!\n");
- }
- return 0;
-}
-#endif
-
static struct pci_driver streamer_pci_driver = {
.name = "lanstreamer",
.id_table = streamer_pci_tbl,
diff -puN drivers/net/tokenring/lanstreamer.h~remove-linux-versionh-from-drivers-net drivers/net/tokenring/lanstreamer.h
--- devel/drivers/net/tokenring/lanstreamer.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/tokenring/lanstreamer.h 2005-07-12 15:21:38.000000000 -0700
@@ -60,20 +60,6 @@
*
*/
-#include <linux/version.h>
-
-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <asm/ioctl.h>
-#define IOCTL_PRINT_RX_BUFS SIOCDEVPRIVATE
-#define IOCTL_PRINT_TX_BUFS SIOCDEVPRIVATE+1
-#define IOCTL_RX_CMD SIOCDEVPRIVATE+2
-#define IOCTL_TX_CMD SIOCDEVPRIVATE+3
-#define IOCTL_PRINT_REGISTERS SIOCDEVPRIVATE+4
-#define IOCTL_PRINT_BDAS SIOCDEVPRIVATE+5
-#define IOCTL_SPIN_LOCK_TEST SIOCDEVPRIVATE+6
-#define IOCTL_SISR_MASK SIOCDEVPRIVATE+7
-#endif
-
/* MAX_INTR - the maximum number of times we can loop
* inside the interrupt function before returning
* control to the OS (maximum value is 256)
diff -puN drivers/net/typhoon.c~remove-linux-versionh-from-drivers-net drivers/net/typhoon.c
--- devel/drivers/net/typhoon.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/typhoon.c 2005-07-12 15:21:38.000000000 -0700
@@ -128,7 +128,6 @@ static const int multicast_filter_limit
#include <asm/uaccess.h>
#include <linux/in6.h>
#include <asm/checksum.h>
-#include <linux/version.h>
#include <linux/dma-mapping.h>
#include "typhoon.h"
@@ -333,12 +332,6 @@ enum state_values {
#define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
#define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
-#define typhoon_synchronize_irq(x) synchronize_irq()
-#else
-#define typhoon_synchronize_irq(x) synchronize_irq(x)
-#endif
-
#if defined(NETIF_F_TSO)
#define skb_tso_size(x) (skb_shinfo(x)->tso_size)
#define TSO_NUM_DESCRIPTORS 2
@@ -2173,7 +2166,7 @@ typhoon_close(struct net_device *dev)
printk(KERN_ERR "%s: unable to stop runtime\n", dev->name);
/* Make sure there is no irq handler running on a different CPU. */
- typhoon_synchronize_irq(dev->irq);
+ synchronize_irq(dev->irq);
free_irq(dev->irq, dev);
typhoon_free_rx_rings(tp);
diff -puN drivers/net/via-velocity.c~remove-linux-versionh-from-drivers-net drivers/net/via-velocity.c
--- devel/drivers/net/via-velocity.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/via-velocity.c 2005-07-12 15:21:38.000000000 -0700
@@ -61,7 +61,6 @@
#include <linux/timer.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <linux/version.h>
#include <linux/string.h>
#include <linux/wait.h>
#include <asm/io.h>
diff -puN drivers/net/wan/farsync.c~remove-linux-versionh-from-drivers-net drivers/net/wan/farsync.c
--- devel/drivers/net/wan/farsync.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wan/farsync.c 2005-07-12 15:21:38.000000000 -0700
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/init.h>
@@ -1806,7 +1805,6 @@ gather_conf_info(struct fst_card_info *c
memset(info, 0, sizeof (struct fstioc_info));
i = port->index;
- info->kernelVersion = LINUX_VERSION_CODE;
info->nports = card->nports;
info->type = card->type;
info->state = card->state;
diff -puN drivers/net/wireless/orinoco.h~remove-linux-versionh-from-drivers-net drivers/net/wireless/orinoco.h
--- devel/drivers/net/wireless/orinoco.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/orinoco.h 2005-07-12 15:21:38.000000000 -0700
@@ -13,7 +13,6 @@
#include <linux/spinlock.h>
#include <linux/netdevice.h>
#include <linux/wireless.h>
-#include <linux/version.h>
#include "hermes.h"
diff -puN drivers/net/wireless/prism54/isl_38xx.c~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/isl_38xx.c
--- devel/drivers/net/wireless/prism54/isl_38xx.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/isl_38xx.c 2005-07-12 15:21:38.000000000 -0700
@@ -18,7 +18,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/delay.h>
diff -puN drivers/net/wireless/prism54/isl_38xx.h~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/isl_38xx.h
--- devel/drivers/net/wireless/prism54/isl_38xx.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/isl_38xx.h 2005-07-12 15:21:38.000000000 -0700
@@ -20,7 +20,6 @@
#ifndef _ISL_38XX_H
#define _ISL_38XX_H
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/byteorder.h>
diff -puN drivers/net/wireless/prism54/isl_ioctl.c~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/isl_ioctl.c
--- devel/drivers/net/wireless/prism54/isl_ioctl.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/isl_ioctl.c 2005-07-12 15:21:38.000000000 -0700
@@ -20,7 +20,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/if_arp.h>
diff -puN drivers/net/wireless/prism54/islpci_dev.c~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/islpci_dev.c
--- devel/drivers/net/wireless/prism54/islpci_dev.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/islpci_dev.c 2005-07-12 15:21:38.000000000 -0700
@@ -19,7 +19,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/netdevice.h>
diff -puN drivers/net/wireless/prism54/islpci_dev.h~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/islpci_dev.h
--- devel/drivers/net/wireless/prism54/islpci_dev.h~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/islpci_dev.h 2005-07-12 15:21:38.000000000 -0700
@@ -23,7 +23,6 @@
#ifndef _ISLPCI_DEV_H
#define _ISLPCI_DEV_H
-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/wireless.h>
#include <net/iw_handler.h>
diff -puN drivers/net/wireless/prism54/islpci_eth.c~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/islpci_eth.c
--- devel/drivers/net/wireless/prism54/islpci_eth.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/islpci_eth.c 2005-07-12 15:21:38.000000000 -0700
@@ -17,7 +17,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/pci.h>
diff -puN drivers/net/wireless/prism54/islpci_hotplug.c~remove-linux-versionh-from-drivers-net drivers/net/wireless/prism54/islpci_hotplug.c
--- devel/drivers/net/wireless/prism54/islpci_hotplug.c~remove-linux-versionh-from-drivers-net 2005-07-12 15:21:38.000000000 -0700
+++ devel-akpm/drivers/net/wireless/prism54/islpci_hotplug.c 2005-07-12 15:21:38.000000000 -0700
@@ -18,7 +18,6 @@
*
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
_