Re: CFT: new ath hal (take 2)

Jiri Mikulas wrote:
> Hello
> FYI
> 
> todays RELENG_6
> with
> __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/ath/if_ath.c,v 1.143 2006/05/06 23:23:39 sam Exp $");
> 
> 
> x -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Werror  /usr/src/sys/dev/ath/if_ath.c
> /usr/src/sys/dev/ath/if_ath.c: In function `ath_attach':
> /usr/src/sys/dev/ath/if_ath.c:396: error: too few arguments to function `taskqueue_create'
> /usr/src/sys/dev/ath/if_ath.c:397: warning: implicit declaration of function `taskqueue_start_threads'
> /usr/src/sys/dev/ath/if_ath.c:397: warning: nested extern declaration of `taskqueue_start_threads'
> /usr/src/sys/dev/ath/if_ath.c: In function `ath_fatal_proc':
> /usr/src/sys/dev/ath/if_ath.c:822: warning: implicit declaration of function `ath_hal_getfatalstate'
> /usr/src/sys/dev/ath/if_ath.c:822: warning: nested extern declaration of `ath_hal_getfatalstate'
> *** Error code 1
> 
> Stop in /usr/obj/usr/src/sys/ROUTER-IPFW-PF.
> *** Error code 1
> 
> Stop in /usr/src.
> *** Error code 1
> 
> Stop in /usr/src.
> 
> 
> did I something wrong, please ?

You need just the change in rev 1.143, not the entire file.  To 
backmerge a single delta I typically do something like

cvs up -j1.142 -j1.143 if_ath.c

(then hand-patch any conflicts that matter--typically the rcs id gets 
botched).

	Sam