Index: head/sys/modules/agp/Makefile
===================================================================
--- head/sys/modules/agp/Makefile	(revision 267296)
+++ head/sys/modules/agp/Makefile	(revision 267297)
@@ -1,48 +1,47 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/agp
 
 KMOD=	agp
 SRCS=	agp.c agp_if.c
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c \
 	agp_nvidia.c agp_ati.c
 .endif
 .if ${MACHINE} == "i386"
 SRCS+=	agp_amd64.c
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	agp_amd64.c agp_i810.c agp_via.c
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 SRCS+=  agp_apple.c
 .endif
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
 SRCS+=	opt_agp.h
 MFILES=	kern/device_if.m kern/bus_if.m dev/agp/agp_if.m dev/pci/pci_if.m
-WERROR=
 
 EXPORT_SYMS=	agp_find_device		\
 		agp_state		\
 		agp_acquire		\
 		agp_release		\
 		agp_enable		\
 		agp_alloc_memory	\
 		agp_free_memory		\
 		agp_bind_memory		\
 		agp_unbind_memory	\
 		agp_memory_info
 
 
 .if ${MACHINE_CPUARCH} == "i386"  || ${MACHINE_CPUARCH} == "amd64"
 EXPORT_SYMS+=	intel_gtt_clear_range	\
 		intel_gtt_insert_pages	\
 		intel_gtt_get		\
 		intel_gtt_chipset_flush	\
 		intel_gtt_unmap_memory	\
 		intel_gtt_map_memory	\
 		intel_gtt_insert_sg_entries \
 		intel_gtt_get_bridge_device
 .endif
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/aic7xxx/ahd/Makefile
===================================================================
--- head/sys/modules/aic7xxx/ahd/Makefile	(revision 267296)
+++ head/sys/modules/aic7xxx/ahd/Makefile	(revision 267297)
@@ -1,48 +1,47 @@
 
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
 
-WERROR=
 GENSRCS= aic79xx_seq.h aic79xx_reg.h
 REG_PRINT_OPT=
 AHD_REG_PRETTY_PRINT=1
 .ifdef AHD_REG_PRETTY_PRINT
 GENSRCS += aic79xx_reg_print.c
 CFLAGS+= -DAHD_REG_PRETTY_PRINT=1
 REG_PRINT_OPT= -p aic79xx_reg_print.c
 .endif
 BEFORE_DEPEND= ${GENSRCS}
 
 .if make(ahdfirmware)
 ahdfirmware: ${GENSRCS}
 ${GENSRCS}:								 \
 		${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq}	 \
 		${.CURDIR}/../../../cam/scsi/scsi_message.h
 	aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
 			-I${.CURDIR}/../../../dev/aic7xxx		 \
 			-o aic79xx_seq.h -r aic79xx_reg.h		 \
 			${REG_PRINT_OPT}				 \
 			-i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \
 			${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq
 .else
 ${GENSRCS}:
 	@echo "Error: ${.TARGET} is missing.  Run 'make ahdfirmware'."
 .endif
 
 
 SRCS= ${GENSRCS}
 SRCS+= aic79xx.c aic79xx_osm.c aic79xx_pci.c ahd_pci.c
 SRCS+= opt_scsi.h opt_aic79xx.h opt_cam.h opt_ddb.h
 SRCS+= device_if.h bus_if.h pci_if.h
 
 .if make(cleanfirmware)
 cleanfirmware: clean
 CLEANFILES= ${GENSRCS}
 .endif
 
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.ahd_pci.c=	${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
Index: head/sys/modules/bios/smapi/Makefile
===================================================================
--- head/sys/modules/bios/smapi/Makefile	(revision 267296)
+++ head/sys/modules/bios/smapi/Makefile	(revision 267297)
@@ -1,15 +1,14 @@
 # $FreeBSD$
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
 
 KMOD=	smapi
 SRCS=	smapi.c smapi_bios.S \
 	bus_if.h device_if.h
-WERROR=
 
 .include <bsd.kmod.mk>
 
 # XXX: clang integrated-as doesn't grok 16-bit assembly yet
 CFLAGS.smapi_bios.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: head/sys/modules/sound/driver/maestro/Makefile
===================================================================
--- head/sys/modules/sound/driver/maestro/Makefile	(revision 267296)
+++ head/sys/modules/sound/driver/maestro/Makefile	(revision 267297)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_maestro
 SRCS=	device_if.h bus_if.h pci_if.h
 SRCS+=	maestro.c
-WERROR=
 
 .include <bsd.kmod.mk>