aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/8139too.c2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/amd8111e.c2
-rw-r--r--drivers/net/ariadne.c2
-rw-r--r--drivers/net/ariadne.h2
-rw-r--r--drivers/net/au1000_eth.c2
-rw-r--r--drivers/net/bonding/bond_sysfs.c2
-rw-r--r--drivers/net/e100.c2
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/fealnx.c1
-rw-r--r--drivers/net/hamradio/6pack.c2
-rw-r--r--drivers/net/hamradio/Kconfig2
-rw-r--r--drivers/net/irda/actisys-sir.c2
-rw-r--r--drivers/net/irda/actisys.c2
-rw-r--r--drivers/net/irda/donauboe.c2
-rw-r--r--drivers/net/irda/girbil-sir.c2
-rw-r--r--drivers/net/irda/girbil.c2
-rw-r--r--drivers/net/irda/irport.h2
-rw-r--r--drivers/net/irda/irtty-sir.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c2
-rw-r--r--drivers/net/irda/nsc-ircc.h2
-rw-r--r--drivers/net/irda/tekram-sir.c2
-rw-r--r--drivers/net/irda/tekram.c2
-rw-r--r--drivers/net/irda/w83977af_ir.h2
-rw-r--r--drivers/net/natsemi.c2
-rw-r--r--drivers/net/smc911x.c2
-rw-r--r--drivers/net/spider_net.c2
-rw-r--r--drivers/net/tc35815.c4
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/usb/Kconfig2
-rw-r--r--drivers/net/via-velocity.c2
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_xmit.h2
-rw-r--r--drivers/net/wireless/ipw2100.c4
-rw-r--r--drivers/net/wireless/ipw2200.c2
-rw-r--r--drivers/net/wireless/netwave_cs.c8
35 files changed, 39 insertions, 40 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 973b684c11e3..eef6fecfff2a 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -73,7 +73,7 @@
73 73
74 Jean-Jacques Michel - bug fix 74 Jean-Jacques Michel - bug fix
75 75
76 Tobias Ringström - Rx interrupt status checking suggestion 76 Tobias Ringström - Rx interrupt status checking suggestion
77 77
78 Andrew Morton - Clear blocked signals, avoid 78 Andrew Morton - Clear blocked signals, avoid
79 buffer overrun setting current->comm. 79 buffer overrun setting current->comm.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2cafa5c1783e..ce34b539bf38 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -855,7 +855,7 @@ config BFIN_MAC_USE_L1
855 depends on BFIN_MAC && BF537 855 depends on BFIN_MAC && BF537
856 default y 856 default y
857 help 857 help
858 To get maximum network performace, you should use L1 memory as rx/tx buffers. 858 To get maximum network performance, you should use L1 memory as rx/tx buffers.
859 Say N here if you want to reserve L1 memory for other uses. 859 Say N here if you want to reserve L1 memory for other uses.
860 860
861config BFIN_TX_DESC_NUM 861config BFIN_TX_DESC_NUM
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 1cc74ec88a58..eebf5bb2b03a 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev)
1111 1111
1112 return new_stats; 1112 return new_stats;
1113} 1113}
1114/* This function recalculate the interupt coalescing mode on every interrupt 1114/* This function recalculate the interrupt coalescing mode on every interrupt
1115according to the datarate and the packet rate. 1115according to the datarate and the packet rate.
1116*/ 1116*/
1117static int amd8111e_calc_coalesce(struct net_device *dev) 1117static int amd8111e_calc_coalesce(struct net_device *dev)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 3fa3bccd1adb..10f3a196be32 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver (p2@mind.be) 5 * Peter De Schrijver (p2@mind.be)
6 * 6 *
7 * --------------------------------------------------------------------------- 7 * ---------------------------------------------------------------------------
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h
index f7913d5a39f1..bb613f292e04 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ariadne.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver 5 * Peter De Schrijver
6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) 6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be)
7 * 7 *
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 185f98e3964c..504b7ce2747d 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -542,7 +542,7 @@ static struct {
542static int num_ifs; 542static int num_ifs;
543 543
544/* 544/*
545 * Setup the base address and interupt of the Au1xxx ethernet macs 545 * Setup the base address and interrupt of the Au1xxx ethernet macs
546 * based on cpu type and whether the interface is enabled in sys_pinfunc 546 * based on cpu type and whether the interface is enabled in sys_pinfunc
547 * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. 547 * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0.
548 */ 548 */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 80c0c8c415ed..855dc10ffa1b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -55,7 +55,7 @@ static int expected_refcount = -1;
55static struct class *netdev_class; 55static struct class *netdev_class;
56/*--------------------------- Data Structures -----------------------------*/ 56/*--------------------------- Data Structures -----------------------------*/
57 57
58/* Bonding sysfs lock. Why can't we just use the subsytem lock? 58/* Bonding sysfs lock. Why can't we just use the subsystem lock?
59 * Because kobject_register tries to acquire the subsystem lock. If 59 * Because kobject_register tries to acquire the subsystem lock. If
60 * we already hold the lock (which we would if the user was creating 60 * we already hold the lock (which we would if the user was creating
61 * a new bond through the sysfs interface), we deadlock. 61 * a new bond through the sysfs interface), we deadlock.
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 64f35e20fd48..3dbaec680b46 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
1324 if (!--counter) break; 1324 if (!--counter) break;
1325 } 1325 }
1326 1326
1327 /* ack any interupts, something could have been set */ 1327 /* ack any interrupts, something could have been set */
1328 iowrite8(~0, &nic->csr->scb.stat_ack); 1328 iowrite8(~0, &nic->csr->scb.stat_ack);
1329 1329
1330 /* if the command failed, or is not OK, notify and return */ 1330 /* if the command failed, or is not OK, notify and return */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 047263830e6a..f1ce348470cc 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3590,7 +3590,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
3590 3590
3591 spin_lock_irqsave(&adapter->stats_lock, flags); 3591 spin_lock_irqsave(&adapter->stats_lock, flags);
3592 3592
3593 /* these counters are modified from e1000_adjust_tbi_stats, 3593 /* these counters are modified from e1000_tbi_adjust_stats,
3594 * called from the interrupt context, so they must only 3594 * called from the interrupt context, so they must only
3595 * be written while holding adapter->stats_lock 3595 * be written while holding adapter->stats_lock
3596 */ 3596 */
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 43f7647ff246..7bb9c728a1d3 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -111,7 +111,6 @@ MODULE_AUTHOR("Myson or whoever");
111MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver"); 111MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver");
112MODULE_LICENSE("GPL"); 112MODULE_LICENSE("GPL");
113module_param(max_interrupt_work, int, 0); 113module_param(max_interrupt_work, int, 0);
114//MODULE_PARM(min_pci_latency, "i");
115module_param(debug, int, 0); 114module_param(debug, int, 0);
116module_param(rx_copybreak, int, 0); 115module_param(rx_copybreak, int, 0);
117module_param(multicast_filter_limit, int, 0); 116module_param(multicast_filter_limit, int, 0);
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index ad9e327c3b03..e0119f6a3319 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -3,7 +3,7 @@
3 * devices like TTY. It interfaces between a raw TTY and the 3 * devices like TTY. It interfaces between a raw TTY and the
4 * kernel's AX.25 protocol layers. 4 * kernel's AX.25 protocol layers.
5 * 5 *
6 * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de> 6 * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de>
7 * Ralf Baechle DL5RB <ralf@linux-mips.org> 7 * Ralf Baechle DL5RB <ralf@linux-mips.org>
8 * 8 *
9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by 9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 36d2c7d4f4d0..62d5d5cfd6a6 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -64,7 +64,7 @@ config DMASCC
64 dmascc. If you don't pass any parameter to the driver, all 64 dmascc. If you don't pass any parameter to the driver, all
65 possible I/O addresses are probed. This could irritate other devices 65 possible I/O addresses are probed. This could irritate other devices
66 that are currently not in use. You may specify the list of addresses 66 that are currently not in use. You may specify the list of addresses
67 to be probed by "dmascc=addr1,addr2,..." (when compiled into the 67 to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the
68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The 68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
69 network interfaces will be called dmascc0 and dmascc1 for the board 69 network interfaces will be called dmascc0 and dmascc1 for the board
70 detected first, dmascc2 and dmascc3 for the second one, and so on. 70 detected first, dmascc2 and dmascc3 for the second one, and so on.
diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
index ccf6ec548a64..736d2473b7e1 100644
--- a/drivers/net/irda/actisys-sir.c
+++ b/drivers/net/irda/actisys-sir.c
@@ -21,7 +21,7 @@
21 * published by the Free Software Foundation; either version 2 of 21 * published by the Free Software Foundation; either version 2 of
22 * the License, or (at your option) any later version. 22 * the License, or (at your option) any later version.
23 * 23 *
24 * Neither Dag Brattli nor University of Tromsø admit liability nor 24 * Neither Dag Brattli nor University of Tromsø admit liability nor
25 * provide warranty for any of this software. This material is 25 * provide warranty for any of this software. This material is
26 * provided "AS-IS" and at no charge. 26 * provided "AS-IS" and at no charge.
27 * 27 *
diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c
index b2e31f4a384c..ae0b80a5680c 100644
--- a/drivers/net/irda/actisys.c
+++ b/drivers/net/irda/actisys.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index a82d8f98383d..1257e1a7e819 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
595 OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); 595 OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1);
596 OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); 596 OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2);
597 597
598 /*Enable DMA controler in byte mode and RX */ 598 /*Enable DMA controller in byte mode and RX */
599 OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); 599 OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H);
600 600
601 /* Start up the clocks */ 601 /* Start up the clocks */
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index 0d2fe87fb9b7..738531b16bd3 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 248aeb0c726c..1f57391a618b 100644
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 3f46b84c6c85..66fc2433e97d 100644
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 6f5f697ec9f8..2c6f7be36e8a 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 12b9378c587f..a873d2b315ca 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index dacf671abcd6..bbdc97ff83ca 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c
index 0dd6bc7af3f2..d1ce5ae6a172 100644
--- a/drivers/net/irda/tekram-sir.c
+++ b/drivers/net/irda/tekram-sir.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index 8f6258221cb0..9bfd2441adbf 100644
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/net/irda/w83977af_ir.h
index 0b7661deafee..87c3975baf62 100644
--- a/drivers/net/irda/w83977af_ir.h
+++ b/drivers/net/irda/w83977af_ir.h
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 50e1ec67ef9c..953117152bbd 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
996 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that 996 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
997 made udelay() unreliable. 997 made udelay() unreliable.
998 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is 998 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
999 depricated. 999 deprecated.
1000*/ 1000*/
1001#define eeprom_delay(ee_addr) readl(ee_addr) 1001#define eeprom_delay(ee_addr) readl(ee_addr)
1002 1002
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7c60df46fc65..dd18af0ce676 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)
1223 } 1223 }
1224#endif 1224#endif
1225 1225
1226 /* Handle PHY interupt condition */ 1226 /* Handle PHY interrupt condition */
1227 if (status & INT_STS_PHY_INT_) { 1227 if (status & INT_STS_PHY_INT_) {
1228 DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); 1228 DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name);
1229 smc911x_phy_interrupt(dev); 1229 smc911x_phy_interrupt(dev);
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 571060a3c91e..bccae7e5c6ad 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
1639 1639
1640/** 1640/**
1641 * spider_net_interrupt - interrupt handler for spider_net 1641 * spider_net_interrupt - interrupt handler for spider_net
1642 * @irq: interupt number 1642 * @irq: interrupt number
1643 * @ptr: pointer to net_device 1643 * @ptr: pointer to net_device
1644 * @regs: PU registers 1644 * @regs: PU registers
1645 * 1645 *
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8038f2882c9b..d887c05588d5 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev)
1654 panic_queues(dev); 1654 panic_queues(dev);
1655 } 1655 }
1656#endif 1656#endif
1657 /* pass BD to controler */ 1657 /* pass BD to controller */
1658#ifndef TC35815_USE_PACKEDBUFFER 1658#ifndef TC35815_USE_PACKEDBUFFER
1659 if (!lp->rx_skbs[curid].skb) { 1659 if (!lp->rx_skbs[curid].skb) {
1660 lp->rx_skbs[curid].skb = 1660 lp->rx_skbs[curid].skb =
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev)
1694 } 1694 }
1695#endif 1695#endif
1696 for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { 1696 for (i = 0; i < (bd_count + 1) / 2 + 1; i++) {
1697 /* pass FD to controler */ 1697 /* pass FD to controller */
1698#ifdef DEBUG 1698#ifdef DEBUG
1699 lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); 1699 lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);
1700#else 1700#else
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 3c8e3b63be07..35d0cfcf8c47 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -483,7 +483,7 @@ err_out_netdev:
483 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that 483 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
484 made udelay() unreliable. 484 made udelay() unreliable.
485 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is 485 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
486 depricated. 486 deprecated.
487*/ 487*/
488#define eeprom_delay(ee_addr) ioread32(ee_addr) 488#define eeprom_delay(ee_addr) ioread32(ee_addr)
489 489
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 8dc09a3790cb..5a96d74e4ce8 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -71,7 +71,7 @@ config USB_PEGASUS
71 select MII 71 select MII
72 ---help--- 72 ---help---
73 Say Y here if you know you have Pegasus or Pegasus-II based adapter. 73 Say Y here if you know you have Pegasus or Pegasus-II based adapter.
74 If in doubt then look at <file:drivers/usb/net/pegasus.h> for the 74 If in doubt then look at <file:drivers/net/usb/pegasus.h> for the
75 complete list of supported devices. 75 complete list of supported devices.
76 76
77 If your particular adapter is not in the list and you are _sure_ it 77 If your particular adapter is not in the list and you are _sure_ it
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4ae05799ac44..5c4a92de9a07 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
1648 * 1648 *
1649 * Scan the queues looking for transmitted packets that 1649 * Scan the queues looking for transmitted packets that
1650 * we can complete and clean up. Update any statistics as 1650 * we can complete and clean up. Update any statistics as
1651 * neccessary/ 1651 * necessary/
1652 */ 1652 */
1653 1653
1654static int velocity_tx_srv(struct velocity_info *vptr, u32 status) 1654static int velocity_tx_srv(struct velocity_info *vptr, u32 status)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
index 9ecf2bf0d25d..47c135a7f4dc 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
87 87
88/* RX header as received from the hardware. */ 88/* RX header as received from the hardware. */
89struct bcm43xx_rxhdr { 89struct bcm43xx_rxhdr {
90 /* Frame Length. Must be generated explicitely in PIO mode. */ 90 /* Frame Length. Must be generated explicitly in PIO mode. */
91 __le16 frame_length; 91 __le16 frame_length;
92 PAD_BYTES(2); 92 PAD_BYTES(2);
93 /* Flags field 1 */ 93 /* Flags field 1 */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 7a7797560a23..a6c7904de282 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6047,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
6047 * ends up causing problems. So, we just handle 6047 * ends up causing problems. So, we just handle
6048 * the WX extensions through the ipw2100_ioctl interface */ 6048 * the WX extensions through the ipw2100_ioctl interface */
6049 6049
6050 /* memset() puts everything to 0, so we only have explicitely set 6050 /* memset() puts everything to 0, so we only have explicitly set
6051 * those values that need to be something else */ 6051 * those values that need to be something else */
6052 6052
6053 /* If power management is turned on, default to AUTO mode */ 6053 /* If power management is turned on, default to AUTO mode */
@@ -7509,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev,
7509 switch (wrqu->power.flags & IW_POWER_MODE) { 7509 switch (wrqu->power.flags & IW_POWER_MODE) {
7510 case IW_POWER_ON: /* If not specified */ 7510 case IW_POWER_ON: /* If not specified */
7511 case IW_POWER_MODE: /* If set all mask */ 7511 case IW_POWER_MODE: /* If set all mask */
7512 case IW_POWER_ALL_R: /* If explicitely state all */ 7512 case IW_POWER_ALL_R: /* If explicitly state all */
7513 break; 7513 break;
7514 default: /* Otherwise we don't support it */ 7514 default: /* Otherwise we don't support it */
7515 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", 7515 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index feb8fcbab2d5..e3c828401b9a 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev,
9603 switch (wrqu->power.flags & IW_POWER_MODE) { 9603 switch (wrqu->power.flags & IW_POWER_MODE) {
9604 case IW_POWER_ON: /* If not specified */ 9604 case IW_POWER_ON: /* If not specified */
9605 case IW_POWER_MODE: /* If set all mask */ 9605 case IW_POWER_MODE: /* If set all mask */
9606 case IW_POWER_ALL_R: /* If explicitely state all */ 9606 case IW_POWER_ALL_R: /* If explicitly state all */
9607 break; 9607 break;
9608 default: /* Otherwise we don't support it */ 9608 default: /* Otherwise we don't support it */
9609 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", 9609 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index c2d71afd57e5..2402cb8dd328 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -4,18 +4,18 @@
4 * Version: 0.4.1 4 * Version: 0.4.1
5 * Description: Netwave AirSurfer Wireless LAN PC Card driver 5 * Description: Netwave AirSurfer Wireless LAN PC Card driver
6 * Status: Experimental. 6 * Status: Experimental.
7 * Authors: John Markus Bjørndalen <johnm@cs.uit.no> 7 * Authors: John Markus Bjørndalen <johnm@cs.uit.no>
8 * Dag Brattli <dagb@cs.uit.no> 8 * Dag Brattli <dagb@cs.uit.no>
9 * David Hinds <dahinds@users.sourceforge.net> 9 * David Hinds <dahinds@users.sourceforge.net>
10 * Created at: A long time ago! 10 * Created at: A long time ago!
11 * Modified at: Mon Nov 10 11:54:37 1997 11 * Modified at: Mon Nov 10 11:54:37 1997
12 * Modified by: Dag Brattli <dagb@cs.uit.no> 12 * Modified by: Dag Brattli <dagb@cs.uit.no>
13 * 13 *
14 * Copyright (c) 1997 University of Tromsø, Norway 14 * Copyright (c) 1997 University of Tromsø, Norway
15 * 15 *
16 * Revision History: 16 * Revision History:
17 * 17 *
18 * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> 18 * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no>
19 * - Fixed some bugs in netwave_rx and cleaned it up a bit. 19 * - Fixed some bugs in netwave_rx and cleaned it up a bit.
20 * (One of the bugs would have destroyed packets when receiving 20 * (One of the bugs would have destroyed packets when receiving
21 * multiple packets per interrupt). 21 * multiple packets per interrupt).
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG;
158module_param(pc_debug, int, 0); 158module_param(pc_debug, int, 0);
159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
160static char *version = 160static char *version =
161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; 161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
162#else 162#else
163#define DEBUG(n, args...) 163#define DEBUG(n, args...)
164#endif 164#endif