Index: sys/modules/xfs/Makefile
===================================================================
--- sys/modules/xfs/Makefile	(revision 228878)
+++ sys/modules/xfs/Makefile	(working copy)
@@ -6,8 +6,6 @@
 
 KMOD=	 xfs
 
-WERROR=
-
 SRCS =  vnode_if.h \
 	xfs_alloc.c \
 	xfs_alloc_btree.c \
Index: sys/modules/sound/driver/maestro/Makefile
===================================================================
--- sys/modules/sound/driver/maestro/Makefile	(revision 228878)
+++ sys/modules/sound/driver/maestro/Makefile	(working copy)
@@ -5,6 +5,5 @@
 KMOD=	snd_maestro
 SRCS=	device_if.h bus_if.h pci_if.h
 SRCS+=	maestro.c
-WERROR=
 
 .include <bsd.kmod.mk>
Index: sys/modules/aic7xxx/ahd/Makefile
===================================================================
--- sys/modules/aic7xxx/ahd/Makefile	(revision 228878)
+++ sys/modules/aic7xxx/ahd/Makefile	(working copy)
@@ -4,7 +4,6 @@
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
 
-WERROR=
 GENSRCS= aic79xx_seq.h aic79xx_reg.h
 REG_PRINT_OPT=
 AHD_REG_PRETTY_PRINT=1
Index: sys/modules/ie/Makefile
===================================================================
--- sys/modules/ie/Makefile	(revision 228878)
+++ sys/modules/ie/Makefile	(working copy)
@@ -6,6 +6,8 @@
 KMOD=	if_ie
 SRCS=	if_ie.c if_ie_isa.c \
 	isa_if.h bus_if.h device_if.h
+.if ${MACHINE_CPUARCH} == "i386"
 WERROR=
+.endif
 
 .include <bsd.kmod.mk>
Index: sys/modules/agp/Makefile
===================================================================
--- sys/modules/agp/Makefile	(revision 228878)
+++ sys/modules/agp/Makefile	(working copy)
@@ -20,7 +20,6 @@
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
 SRCS+=	opt_agp.h opt_bus.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		\
Index: sys/modules/bios/smapi/Makefile
===================================================================
--- sys/modules/bios/smapi/Makefile	(revision 228878)
+++ sys/modules/bios/smapi/Makefile	(working copy)
@@ -6,7 +6,6 @@
 KMOD=	smapi
 SRCS=	smapi.c smapi_bios.S \
 	bus_if.h device_if.h
-WERROR=
 .if ${CC:T:Mclang} == "clang"
 # XXX: clang integrated-as doesn't grok 16-bit assembly yet
 CFLAGS+=	${.IMPSRC:T:Msmapi_bios.S:C/^.+$/-no-integrated-as/}
Index: sys/modules/nve/Makefile
===================================================================
--- sys/modules/nve/Makefile	(revision 228878)
+++ sys/modules/nve/Makefile	(working copy)
@@ -7,7 +7,9 @@
 	device_if.h bus_if.h pci_if.h miibus_if.h \
 	os+%DIKED-nve.h
 OBJS+=	nvenetlib.o
+.if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Mclang} == "clang"
 WERROR=
+.endif
 
 CLEANFILES+=	nvenetlib.o os+%DIKED-nve.h
 nvenetlib.o: ${.CURDIR}/../../contrib/dev/nve/${MACHINE}/${.TARGET}.bz2.uu