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/skfp/fplustm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/skfp/fplustm.c') diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c index 4d816c584..103df16e1 100644 --- a/drivers/net/skfp/fplustm.c +++ b/drivers/net/skfp/fplustm.c @@ -87,7 +87,7 @@ static const u_short my_sagp = 0xffff ; /* short group address (n.u.) */ /* - * usefull interrupt bits + * useful interrupt bits */ static int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ; static int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0| @@ -1381,7 +1381,7 @@ struct s_smc *smc ; CHECK_CAM() ; /* - * wirte the multicast addres into the CAM + * write the multicast address into the CAM */ outpw(FM_A(FM_AFCOMP2), (u_short)((tb->a.a[0]<<8)+tb->a.a[1])) ; -- cgit v1.2.3