From 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Apr 2001 04:55:58 +0000 Subject: 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. --- drivers/net/macmace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/macmace.c') diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 38843f5e4..a93002904 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c @@ -632,7 +632,7 @@ static void mace68k_handle_misc_intrs(struct mace68k_data *mp, int intr) } /* - * A transmit error has occured. (We kick the transmit side from + * A transmit error has occurred. (We kick the transmit side from * the DMA completion) */ @@ -661,7 +661,7 @@ static void mace68k_xmit_error(struct net_device *dev) } /* - * A receive interrupt occured. + * A receive interrupt occurred. */ static void mace68k_recv_interrupt(struct net_device *dev) -- cgit v1.2.3