You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================


ChangeSet@1.797.106.8, 2002-11-23 15:55:41-02:00, acme@conectiva.com.br
  o drivers/net/ni65.c: test_bit and friends require long
  
  Also convert some structs to C99 initialization style.


 ni65.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)


diff -Nru a/drivers/net/ni65.c b/drivers/net/ni65.c
--- a/drivers/net/ni65.c	Fri Dec  6 23:17:44 2002
+++ b/drivers/net/ni65.c	Fri Dec  6 23:17:44 2002
@@ -184,11 +184,41 @@
 	short addr_offset;
 	unsigned char *vendor_id;
 	char *cardname;
-	unsigned char config;
+	long config;
 } cards[] = {
-	{ NI65_ID0,NI65_ID1,0x0e,0x10,0x0,0x8,ni_vendor,"ni6510", 0x1 } ,
-	{ NI65_EB_ID0,NI65_EB_ID1,0x0e,0x18,0x10,0x0,ni_vendor,"ni6510 EtherBlaster", 0x2 } ,
-	{ NE2100_ID0,NE2100_ID1,0x0e,0x18,0x10,0x0,NULL,"generic NE2100", 0x0 }
+	{
+		.id0	     = NI65_ID0,
+		.id1	     = NI65_ID1,
+		.id_offset   = 0x0e,
+		.total_size  = 0x10,
+		.cmd_offset  = 0x0,
+		.addr_offset = 0x8,
+		.vendor_id   = ni_vendor,
+		.cardname    = "ni6510",
+		.config	     = 0x1,
+       	},
+	{
+		.id0	     = NI65_EB_ID0,
+		.id1	     = NI65_EB_ID1,
+		.id_offset   = 0x0e,
+		.total_size  = 0x18,
+		.cmd_offset  = 0x10,
+		.addr_offset = 0x0,
+		.vendor_id   = ni_vendor,
+		.cardname    = "ni6510 EtherBlaster",
+		.config	     = 0x2,
+       	},
+	{
+		.id0	     = NE2100_ID0,
+		.id1	     = NE2100_ID1,
+		.id_offset   = 0x0e,
+		.total_size  = 0x18,
+		.cmd_offset  = 0x10,
+		.addr_offset = 0x0,
+		.vendor_id   = NULL,
+		.cardname    = "generic NE2100",
+		.config	     = 0x0,
+	},
 };
 #define NUM_CARDS 3
 
@@ -415,7 +445,8 @@
 	else {
 		if(dev->dma == 0) {
 		/* 'stuck test' from lance.c */
-			int dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0x0f) | (inb(DMA2_STAT_REG) & 0xf0);
+			long dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0x0f) |
+					    (inb(DMA2_STAT_REG) & 0xf0);
 			for(i=1;i<5;i++) {
 				int dma = dmatab[i];
 				if(test_bit(dma,&dma_channels) || request_dma(dma,"ni6510"))

===================================================================


This BitKeeper patch contains the following changesets:
1.797.106.8
## Wrapped with gzip_uu ##


begin 664 bkpatch18503
M'XL(`#A,\3T``]U6VT[;0!!]]G[%"*0*5.+L^&ZC(`)!+8)2Q.79VMB;9-7$
M;G<76JC[[UW;W!2<(E#5AZXM6SHS.WO.S)&3=;A47"86RQ:<K,/'4NG$RLJ"
M9UI<,SLK%_98FL!969I`?U8N>'_OJ+\0*NLYMD],Z)3I;`;77*K$0MM]0/3-
M5YY89P<?+H^'9X0,!K`_8\64GW,-@P'1I;QF\USM,CV;EX6M)2O4@NOFT.HA
MM7(H=<SE8^A2/Z@PH%Y899@C,@]Y3ATO"CQ2\]]=YKU4!=%Q,?0<+ZY\SPM\
M,@*TPSBTD09V!-3I(_8=%]!/?#_QL$>=A%+H+`WO$7J4[,'?E;%/,B@AEZ)N
M9[_@NE^(P+>S!#17.AT+#:S(82(%+W(%DG^[$I*#.7AJ=II[.%<E&+)FOP9E
MI@5*RZM,*T,4]N,81"&T8'-QR[0H"Q.]F7.;'('I2!B2T\<9D=XK%R&44;+S
M0D>>:WO2&H]2K-#QT3//R.>QF56>Y30.>?<85I5K1^W[;E11ZL5A8[_GN2_[
M\*UT5QAR-5UT'!H@5F[HQJTST5VVI!O]V9)N`#W_/_)D/;C/T)/?F]LX[+2#
MQAM\.L(H!"2'[<NJF=;\)F*Z7<=B<$TL1G!=8OTDEF6+G%I0KP&<'`9^>CBB
M6RV.2SC>X6DYF2CSH:M#]`?E#:Q+S>:I$K>\A;&MDBT>TYOL!F5Y+N_A&HT:
M]-KTN)2IR)O*A4A;H*W#9%XPT]XFME:W!^E:&VK4W7,U)V\1:)?U:VN%R(.]
ME3J;T.ND1IU2L5LK?9M6.-`S+O?F3&DNNX4[+P@_<)#23MWWD7\L^^3R^+A+
M\9077(KLCE>WV+J>43GR,*KM7K\<D]<:/E^P-#.?@H+/E<G>V!#%>&/T:8CI
M^<7P(C6_VYNPLP/>)KRK2TTVH:KW6DWY^V3G27*=-J&;VX__";(9S[ZHJ\4@
01I>[$W],?@-*->K3;P@`````
`
end