From: Andy P. <at...@us...> - 2002-04-11 14:35:54
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/h In directory usw-pr-cvs1:/tmp/cvs-serv30336/net/skfp/h Modified Files: skfbi.h smc.h Log Message: synch 2.4.15 commit 50 Index: skfbi.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/h/skfbi.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- skfbi.h 14 Jan 2001 17:41:40 -0000 1.1.1.1 +++ skfbi.h 11 Apr 2002 12:37:50 -0000 1.2 @@ -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) */ Index: smc.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/skfp/h/smc.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- smc.h 14 Jan 2001 17:41:43 -0000 1.1.1.1 +++ smc.h 11 Apr 2002 12:37:50 -0000 1.2 @@ -297,7 +297,7 @@ #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 */ |