ath_rate_sample build error?

I'm a little confused here, as I can't figure out what change broke this
for me.  I am getting this with cvs from Tuesday morning until now.

Relevant kernel config bits...

# Wireless NIC cards
device          wi              # WaveLAN/Intersil/Symbol 802.11
wireless NICs.
device          ath
device          ath_hal         # Atheros HAL (includes binary
component)
#device         ath_rate_onoe   # Onoe rate control for ath driver
#device         ath_rate_amrr   # AMRR rate control for ath driver
device          ath_rate_sample # SampleRate rate control for the ath
driver

device          wlan            # 802.11 support
device          wlan_wep        # 802.11 WEP support
device          wlan_ccmp       # 802.11 CCMP support
device          wlan_tkip       # 802.11 TKIP support
#device         wlan_xauth      # 802.11 external authenticator support
#device         wlan_acl        # 802.11 MAC ACL support

cc -c -O -pipe -march=pentium4m -Wall -Wredundant-decls -Wnested-externs
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
-Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I.
-I/usr/src/sys -I/usr/src/sys/contrib/dev/acpica
-I/usr/src/sys/contrib/altq -D_KERNEL -include opt_global.h -fno-common
-finline-limit=8000 --param inline-unit-growth=100 --param
large-function-growth=1000  -mno-align-long-strings
-mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2
-mno-sse3 -ffreestanding
-Werror  /usr/src/sys/dev/ath/ath_rate/sample/sample.c
In file included from /usr/src/sys/dev/ath/if_athvar.h:47,
                 from /usr/src/sys/dev/ath/ath_rate/sample/sample.c:74:
/usr/src/sys/contrib/dev/ath/ah.h:49:22: ah_osdep.h: No such file or
directory
In file included from /usr/src/sys/dev/ath/if_athvar.h:47,
                 from /usr/src/sys/dev/ath/ath_rate/sample/sample.c:74:
/usr/src/sys/contrib/dev/ath/ah.h:458: error: syntax error before
"HAL_SOFTC"
/usr/src/sys/contrib/dev/ath/ah.h:610: error: syntax error before
"HAL_BUS_ADDR"
/usr/src/sys/contrib/dev/ath/ah.h:610: warning: function declaration
isn't a prototype
/usr/src/sys/contrib/dev/ath/ah.h:639: error: syntax error before
"HAL_SOFTC"
/usr/src/sys/contrib/dev/ath/ah.h:640: warning: function declaration
isn't a prototype
*** Error code 1

Stop in /usr/obj/usr/src/sys/LAPTOP.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

robert.