diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/net/irda | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/irport.c | 4 | ||||
| -rw-r--r-- | drivers/net/irda/irtty.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/smc-ircc.c | 2 | ||||
| -rw-r--r-- | drivers/net/irda/w83977af_ir.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index d08583f84..679d25c30 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c @@ -609,7 +609,7 @@ static void irport_timeout(struct net_device *dev) * * Transmits the current frame until FIFO is full, then * waits until the next transmitt interrupt, and continues until the - * frame is transmited. + * frame is transmitted. */ int irport_hard_xmit(struct sk_buff *skb, struct net_device *dev) { @@ -1008,7 +1008,7 @@ static struct net_device_stats *irport_net_get_stats(struct net_device *dev) #ifdef MODULE MODULE_PARM(io, "1-4i"); -MODULE_PARM_DESC(io, "Base I/O adresses"); +MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM(irq, "1-4i"); MODULE_PARM_DESC(irq, "IRQ lines"); diff --git a/drivers/net/irda/irtty.c b/drivers/net/irda/irtty.c index 8102f5ffb..ff052798b 100644 --- a/drivers/net/irda/irtty.c +++ b/drivers/net/irda/irtty.c @@ -824,7 +824,7 @@ int irtty_set_mode(struct net_device *dev, int mode) /* * Function irtty_raw_read (self, buf, len) * - * Receive incomming data. This function sleeps, so it must only be + * Receive incoming data. This function sleeps, so it must only be * called with a process context. Timeout is currently defined to be * a multiple of 10 ms. */ diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 6d6c7ed5f..92f8e7356 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c @@ -1263,7 +1263,7 @@ static void nsc_ircc_dma_xmit(struct nsc_ircc_cb *self, int iobase) * Function nsc_ircc_pio_xmit (self, iobase) * * Transmit data using PIO. Returns the number of bytes that actually - * got transfered + * got transferred * */ static int nsc_ircc_pio_write(int iobase, __u8 *buf, int len, int fifo_size) diff --git a/drivers/net/irda/smc-ircc.c b/drivers/net/irda/smc-ircc.c index b62eeaf3e..503610899 100644 --- a/drivers/net/irda/smc-ircc.c +++ b/drivers/net/irda/smc-ircc.c @@ -560,7 +560,7 @@ static void ircc_change_speed(void *priv, __u32 speed) */ /* outb(UART_MCR_OUT2, self->io.sir_base + UART_MCR); */ - /* Be ready for incomming frames */ + /* Be ready for incoming frames */ ircc_dma_receive(self, iobase); } else { /* Install SIR transmit handler */ diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 12c017294..2f10dc0a9 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -875,7 +875,7 @@ int w83977af_dma_receive_complete(struct w83977af_ir *self) self->stats.rx_fifo_errors++; } else { - /* Check if we have transfered all data to memory */ + /* Check if we have transferred all data to memory */ switch_bank(iobase, SET0); if (inb(iobase+USR) & USR_RDR) { #ifdef CONFIG_USE_INTERNAL_TIMER |