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.909, 2002-12-06 23:05:11-02:00, acme@conectiva.com.br Merge conectiva.com.br:/home/BK/misc-2.5.old into conectiva.com.br:/home/BK/misc-2.5 char/sx.h | 2 +- net/fealnx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff -Nru a/drivers/char/sx.h b/drivers/char/sx.h --- a/drivers/char/sx.h Fri Dec 6 23:17:30 2002 +++ b/drivers/char/sx.h Fri Dec 6 23:17:30 2002 @@ -44,7 +44,7 @@ int poll; int ta_type; struct timer_list timer; - int locks; + long locks; }; struct vpd_prom { diff -Nru a/drivers/net/fealnx.c b/drivers/net/fealnx.c --- a/drivers/net/fealnx.c Fri Dec 6 23:17:30 2002 +++ b/drivers/net/fealnx.c Fri Dec 6 23:17:30 2002 @@ -1155,8 +1155,8 @@ unsigned int old_linkok = np->linkok; if (debug) - printk(KERN_DEBUG "%s: Media selection timer tick, status %8.8lx " - "config %8.8lx.\n", dev->name, readl(ioaddr + ISR), + printk(KERN_DEBUG "%s: Media selection timer tick, status %8.8x " + "config %8.8x.\n", dev->name, readl(ioaddr + ISR), readl(ioaddr + TCRRCR)); if (np->flags == HAS_MII_XCVR) { @@ -1184,7 +1184,7 @@ long ioaddr = dev->base_addr; int i; - printk(KERN_WARNING "%s: Transmit timed out, status %8.8lx," + printk(KERN_WARNING "%s: Transmit timed out, status %8.8x," " resetting...\n", dev->name, readl(ioaddr + ISR)); { @@ -1554,7 +1554,7 @@ np->stats.rx_crc_errors += (readl(ioaddr + TALLY) & 0x7fff0000) >> 16; if (debug) - printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4lx.\n", + printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n", dev->name, readl(ioaddr + ISR)); writel(np->imrvalue, ioaddr + IMR); =================================================================== This BitKeeper patch contains the following changesets: 1.909 ## Wrapped with gzip_uu ## begin 664 bkpatch18439 M'XL(`"I,\3T``\U634_;0!`]Q[]B)8Y5[)G]\'HMI>*C52O1J(B*4]7#8F_B MD-A&MJ%0^<=W')6`0DCJ%*0Z/F7WS;Z9?>\E!^RB=E4\L$GNO`/VN:R;>)"4 MA4N:V:WUDS+W+RM:."]+6@BR,G?!\6F0S^IDR'WET=*9;9*,W;JJC@?HB]4W MS?VUBP?G'S]=?#DZ][S1B)UDMIBZ;ZYAHY'7E-6M7:3UH6VR15GX366+.G?- M\M!VM;7E`)P^"K4`%;88@M1M@BFBE>A2X#(*Y6.UCN'66L@A1,,U5RT/0VF\ M#PQ]`X8!#Y`'$#(N8E`QXA!X#,"ZT1RNCX2]XVP(WC%[W39.O(2-735U;/W` M^-GL_7*1TO99T91_L=N;;6YD?3K(!8:($ELE`;`73(`,"8:J)RQ2G&`&>\$T MH)*M$B;4O6!H4'4P'?6"\7!)4BK1"R:Y-!TL['4!6JGE!4C=HS?)!42">E-( MJCYE7&M2U'@_^-FC6;UAS\?SP(+W?HV(14AX1X9R& M(*0!*UPHK;L$Q^T+[6RN1EXGF8`"W=(]:$.DKKMLVLZH<$TP<791W/G)(ZF( M;!&U"&!4*PR:"28IE9PH(^4.4L\*/N6E#6FC2\=-N[N@?!/&7E_&#][AK4`4 MT3(UN5@/3=#;0Q/>*C2/;B@%\RXY4W+,U=16OV;SP\JEF6VVCXJZZ9)$HFAY M1+&P=$YW)^-_*_.5#:N?RY<<<;;Q=O=PUE.AK+2^^^=T3[/M4,F:V?Z$.04> MZDYBG434?ZJ0U-ZZ*SH^=7E9S-V]7U93_V;^_>'<'R\W&5)1I*"D1$'HU+), EEO'KE7Q!.2O4/K)Y^%.69"Z9US?YB+(@FG!(O=]VW06S`@H````` ` end