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.

7 files changed, 24 insertions, 19 deletions

diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/skfp/drvfbi.c
index 93533c5ef..0f473dd93 100644
--- a/drivers/net/skfp/drvfbi.c
+++ b/drivers/net/skfp/drvfbi.c
@@ -849,7 +849,7 @@ int	dma;
 
 #ifdef	EISA
 
-/*arrays with io adresses of dma controller length and adress registers*/
+/*arrays with io addresses of dma controller length and address registers*/
 static const int cntr[8] = { 0x001,0x003,0x005,0x007,0,0x0c6,0x0ca,0x0ce } ;
 static const int base[8] = { 0x000,0x002,0x004,0x006,0,0x0c4,0x0c8,0x0cc } ;
 static const int page[8] = { 0x087,0x083,0x081,0x082,0,0x08b,0x089,0x08a } ;
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])) ;
diff --git a/drivers/net/skfp/h/skfbi.h b/drivers/net/skfp/h/skfbi.h
index f127bddb8..43ddc5561 100644
--- a/drivers/net/skfp/h/skfbi.h
+++ b/drivers/net/skfp/h/skfbi.h
@@ -90,7 +90,7 @@
 #define	SKFDDI_PSZ	32		/* address PROM size */
 
 /*
- * address transmision from logical to physical offset address on board
+ * address transmission from logical to physical offset address on board
  */
 #define FMA(a)	(0x0400|((a)<<1))	/* FORMAC+ (r/w) */
 #define P1A(a)	(0x0800|((a)<<1))	/* PLC1 (r/w) */
@@ -347,7 +347,7 @@
 #define SA_PMD_TYPE	(8)	/* start addr. PMD-Type	*/
 
 /*
- * address transmision from logical to physical offset address on board
+ * address transmission from logical to physical offset address on board
  */
 #define	FMA(a)	(0x0100|((a)<<1))	/* FORMAC+ (r/w) */
 #define	P2(a)	(0x00c0|((a)<<1))	/* PLC2 (r/w) (DAS) */
@@ -677,7 +677,7 @@
 #ifdef	ISA
 
 /*
- * address transmision from logic NPADDR6-0 to physical offset address on board
+ * address transmission from logic NPADDR6-0 to physical offset address on board
  */
 #define FMA(a)	(0x8000|(((a)&0x07)<<1)|(((a)&0x78)<<7))  /* FORMAC+ (r/w) */
 #define PRA(a)	(0x1000|(((a)&0x07)<<1)|(((a)&0x18)<<7))  /* PROM (read only)*/
@@ -942,7 +942,7 @@
 /*	PCI_SUB_ID	16 bit	Subsystem ID */
 
 /*	PCI_BASE_ROM	32 bit	Expansion ROM Base Address */
-#define	PCI_ROMBASE	0xfffe0000L  /* Bit 31..17: ROM BASE addres (1st) */
+#define	PCI_ROMBASE	0xfffe0000L  /* Bit 31..17: ROM BASE address (1st) */
 #define	PCI_ROMBASZ	0x0001c000L  /* Bit 16..14: Treat as BASE or SIZE */
 #define	PCI_ROMSIZE	0x00003800L  /* Bit 13..11: ROM Size Requirements */
 #define	PCI_ROMEN	0x00000001L  /* Bit 0:	    Address Decode enable */
@@ -1685,7 +1685,7 @@
 #define PCI_PROG_INTFC	0x00		/* PCI programming Interface (=0) */
 
 /*
- * address transmision from logical to physical offset address on board
+ * address transmission from logical to physical offset address on board
  */
 #define	FMA(a)	(0x0400|((a)<<2))	/* FORMAC+ (r/w) (SN3) */
 #define	P1(a)	(0x0380|((a)<<2))	/* PLC1 (r/w) (DAS) */
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h
index b909586bc..5164b8900 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/skfp/h/smc.h
@@ -297,7 +297,7 @@ struct s_srf {
 #define RS_NORINGOP	(1<< 5)			/* no ring op */
 #define RS_VERSION	(1<< 4)			/* SMT version mismatch */
 #define RS_STUCKBYPASSS	(1<< 3)			/* stuck bypass */
-#define RS_EVENT	(1<< 2)			/* FDDI event occured */
+#define RS_EVENT	(1<< 2)			/* FDDI event occurred */
 #define RS_RINGOPCHANGE	(1<< 1)			/* ring op changed */
 #define RS_RES0		(1<< 0)			/* reserved */
 
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index 5479b27ea..b19b2a81b 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -1722,7 +1722,7 @@ unsigned int cmd;
 	}
 	if (cmd & PL_EBUF_ERR) {	/* elastic buff. det. over-|underflow*/
 		/*
-		 * Check whether the SRF Condition occured.
+		 * Check whether the SRF Condition occurred.
 		 */
 		if (!plc->ebuf_cont && phy->mib->fddiPORTPCMState == PC8_ACTIVE){
 			/*
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 64f1b8051..89762b6c7 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -182,12 +182,17 @@ extern void mac_clear_multicast(struct s_smc *smc);
 extern void enable_tx_irq(struct s_smc *smc, u_short queue);
 extern void mac_drv_clear_txd(struct s_smc *smc);
 
+static struct pci_device_id skfddi_pci_tbl[] __initdata = {
+	{ PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, },
+	{ }			/* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, skfddi_pci_tbl);
 
 // Define module-wide (static) variables
 
-static int num_boards = 0;	/* total number of adapters configured */
-static int num_fddi = 0;
-static int autoprobed = 0;
+static int num_boards;	/* total number of adapters configured */
+static int num_fddi;
+static int autoprobed;
 
 #ifdef MODULE
 int init_module(void);
@@ -195,7 +200,7 @@ void cleanup_module(void);
 static struct net_device *unlink_modules(struct net_device *p);
 static int loading_module = 1;
 #else
-static int loading_module = 0;
+static int loading_module;
 #endif				// MODULE
 
 #ifdef DRIVERDEBUG
@@ -1632,7 +1637,7 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size)
  *	This function is called by the hardware dependent module.
  *	It allocates the memory for the RxD and TxD descriptors.
  *
- *	This memory must be non-cached, non-movable and non-swapable.
+ *	This memory must be non-cached, non-movable and non-swappable.
  *	This memory should start at a physical page boundary.
  * Args
  *	smc - A pointer to the SMT context struct.
diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index d5f091c54..ce757a19f 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -197,7 +197,7 @@ int cond ;
 	struct s_srf_evc	*evc ;
 	int			cond_asserted = 0 ;
 	int			cond_deasserted = 0 ;
-	int			event_occured = 0 ;
+	int			event_occurred = 0 ;
 	int			tsr ;
 	int			T_Limit = 2*TICKS_PER_SECOND ;
 
@@ -246,7 +246,7 @@ int cond ;
 				*evc->evc_multiple  = FALSE ;
 			}
 			smc->srf.any_report = TRUE ;
-			event_occured = TRUE ;
+			event_occurred = TRUE ;
 		}
 #ifdef	FDDI_MIB
 		snmp_srf_event(smc,evc) ;
@@ -268,7 +268,7 @@ int cond ;
 			break ;
 		}
 		/* SR01c */
-		if (event_occured && tsr < T_Limit) {
+		if (event_occurred && tsr < T_Limit) {
 			smc->srf.sr_state = SR1_HOLDOFF ;
 			break ;
 		}
@@ -286,7 +286,7 @@ int cond ;
 			break ;
 		}
 		/* SR00d */
-		if (event_occured && tsr >= T_Limit) {
+		if (event_occurred && tsr >= T_Limit) {
 			smc->srf.TSR = smt_get_time() ;
 			smt_send_srf(smc) ;
 			break ;