PERFORCE change 153721 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=153721

Change 153721 by sam at sam_ebb on 2008/11/28 23:05:03

	remove ath_hal, the hal is now part of ath

Affected files ...

.. //depot/projects/vap/sys/conf/files#55 edit
.. //depot/projects/vap/sys/modules/Makefile#44 edit
.. //depot/projects/vap/sys/modules/ath_hal/Makefile#5 delete

Differences ...

==== //depot/projects/vap/sys/conf/files#55 (text+ko) ====

@@ -502,186 +502,172 @@
 dev/ata/atapi-tape.c		optional atapist
 dev/ata/atapi-cam.c		optional atapicam
 #
-contrib/dev/ath/ah.c				optional ath_hal \
+contrib/dev/ath/ah.c			optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ah_eeprom_v1.c \
-	optional ath_hal_ar5210 \
+contrib/dev/ath/ah_eeprom_v1.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ah_eeprom_v3.c \
-	optional ath_hal_ar5211 | ath_hal_ar5212 \
+contrib/dev/ath/ah_eeprom_v3.c		optional ath_ar5211 | ath_ar5212 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ah_eeprom_v14.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+contrib/dev/ath/ah_eeprom_v14.c		optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ah_regdomain.c			optional ath_hal \
+contrib/dev/ath/ah_regdomain.c			optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_attach.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_attach.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_beacon.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_beacon.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_interrupts.c	optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_interrupts.c	optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_keycache.c	optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_keycache.c	optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_misc.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_misc.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_phy.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_phy.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_power.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_power.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_recv.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_recv.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_reset.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_reset.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5210/ar5210_xmit.c		optional ath_hal_ar5210 \
+contrib/dev/ath/ar5210/ar5210_xmit.c		optional ath_ar5210 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_attach.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_attach.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_beacon.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_beacon.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_interrupts.c	optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_interrupts.c	optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_keycache.c	optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_keycache.c	optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_misc.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_misc.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_phy.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_phy.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_power.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_power.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_recv.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_recv.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_reset.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_reset.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5211/ar5211_xmit.c		optional ath_hal_ar5211 \
+contrib/dev/ath/ar5211/ar5211_xmit.c		optional ath_ar5211 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_ani.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_attach.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_beacon.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_eeprom.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_gpio.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_interrupts.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_keycache.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_misc.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_phy.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_power.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_recv.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_reset.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_rfgain.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5212/ar5212_xmit.c \
-	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar2316.c \
-	optional ath_hal_rf2316 \
+contrib/dev/ath/ar5212/ar2316.c	optional ath_rf2316 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar2317.c	 \
-	optional ath_hal_rf2317 \
+contrib/dev/ath/ar5212/ar2317.c	optional ath_rf2317 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar2413.c	 \
-	optional ath_hal_rf2413 \
+contrib/dev/ath/ar5212/ar2413.c	optional ath_rf2413 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar2425.c \
-	optional ath_hal_rf2425 | ath_hal_rf2417 \
+contrib/dev/ath/ar5212/ar2425.c	optional ath_rf2425 | ath_rf2417 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar5111.c	 \
-	optional ath_hal_rf5111 \
+contrib/dev/ath/ar5212/ar5111.c	optional ath_rf5111 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar5112.c \
-	optional ath_hal_rf5112 \
+contrib/dev/ath/ar5212/ar5112.c	optional ath_rf5112 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5212/ar5413.c \
-	optional ath_hal_rf5413 \
+contrib/dev/ath/ar5212/ar5413.c	optional ath_rf5413 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5416/ar2133.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 \
+contrib/dev/ath/ar5416/ar2133.c	optional ath_ar5416 | ath_ar9160 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_ani.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_attach.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_beacon.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_cal.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_cal_iq.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_eeprom.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_gpio.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_interrupts.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_keycache.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_misc.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_phy.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_power.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_recv.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_reset.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 contrib/dev/ath/ar5416/ar5416_xmit.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	optional ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5416/ar9160_attach.c \
-	optional ath_hal_ar5416 | ath_hal_ar9160 \
+contrib/dev/ath/ar5416/ar9160_attach.c	optional ath_ar5416 | ath_ar9160 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5416/ar9280.c \
-	optional ath_hal_ar9280 \
+contrib/dev/ath/ar5416/ar9280.c		optional ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-contrib/dev/ath/ar5416/ar9280_attach.c \
-	optional ath_hal_ar9280 \
+contrib/dev/ath/ar5416/ar9280_attach.c	optional ath_ar9280 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
-dev/ath/ah_osdep.c optional ath_hal \
+dev/ath/ah_osdep.c		optional ath \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
 	compile-with "${NORMAL_C} -I$S/dev/ath"

==== //depot/projects/vap/sys/modules/Makefile#44 (text+ko) ====

@@ -28,11 +28,10 @@
 	${_asmc} \
 	${_asr} \
 	ata \
-	${_ath} \
-	${_ath_hal} \
-	${_ath_rate_amrr} \
-	${_ath_rate_onoe} \
-	${_ath_rate_sample} \
+	ath \
+	ath_rate_amrr \
+	ath_rate_onoe \
+	ath_rate_sample \
 	aue \
 	${_auxio} \
 	axe \
@@ -383,11 +382,6 @@
 _apm=		apm
 _ar=		ar
 _arcnet=	arcnet
-_ath=		ath
-_ath_hal=	ath_hal
-_ath_rate_amrr=	ath_rate_amrr
-_ath_rate_onoe=	ath_rate_onoe
-_ath_rate_sample=ath_rate_sample
 _bktr=		bktr
 _cardbus=	cardbus
 _cbb=		cbb
@@ -520,11 +514,6 @@
 _an=		an
 _arcmsr=	arcmsr
 _asmc=		asmc
-_ath=		ath
-_ath_hal=	ath_hal
-_ath_rate_amrr=	ath_rate_amrr
-_ath_rate_onoe=	ath_rate_onoe
-_ath_rate_sample=ath_rate_sample
 _cardbus=	cardbus
 _cbb=		cbb
 _cmx=		cmx
@@ -632,11 +621,6 @@
 
 .if ${MACHINE_ARCH} == "powerpc"
 _an=		an
-_ath=		ath
-_ath_hal=	ath_hal
-_ath_rate_amrr=	ath_rate_amrr
-_ath_rate_onoe=	ath_rate_onoe
-_ath_rate_sample=ath_rate_sample
 _bm=		bm
 _nvram=		powermac_nvram
 _smbfs=		smbfs
@@ -644,11 +628,6 @@
 .endif
 
 .if ${MACHINE_ARCH} == "sparc64"
-_ath=		ath
-_ath_hal=	ath_hal
-_ath_rate_amrr=	ath_rate_amrr
-_ath_rate_onoe=	ath_rate_onoe
-_ath_rate_sample=ath_rate_sample
 _auxio=		auxio
 _em=		em
 _i2c=		i2c