Build the iwm and iwmfw modules by default on x86.

sys/modules/Makefile

@@ -174,6 +174,8 @@ SUBDIR=	\
 	${_ispfw} \
 	${_iwi} \
 	${_iwifw} \
+	${_iwm} \
+	${_iwmfw} \
 	${_iwn} \
 	${_iwnfw} \
 	${_ix} \
@@ -575,20 +577,18 @@ _ida=		ida
 _iir=		iir
 _ipmi=		ipmi
 _ips=		ips
+_isci=		isci
 _ipw=		ipw
+_iwi=		iwi
+_iwm=		iwm
+_iwn=		iwn
+_ixgb=		ixgb
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
-.endif
-_isci=		isci
-_iwi=		iwi
-.if ${MK_SOURCELESS_UCODE} != "no"
 _iwifw=		iwifw
-.endif
-_iwn=		iwn
-.if ${MK_SOURCELESS_UCODE} != "no"
+_iwmfw=		iwmfw
 _iwnfw=		iwnfw
 .endif
-_ixgb=		ixgb
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=		mlx4
 _mlx4ib=	mlx4ib

sys/modules/iwm/Makefile

@@ -9,9 +9,8 @@ SRCS+=	if_iwm_mac_ctxt.c if_iwm_phy_ctxt.c if_iwm_time_event.c
 SRCS+=	if_iwm_power.c if_iwm_scan.c
 # bus layer
 SRCS+=	if_iwm_pcie_trans.c
-
 SRCS+=	device_if.h bus_if.h pci_if.h opt_wlan.h
 
-CFLAGS+= -DIWM_DEBUG -I${.CURDIR}/../../dev/iwm
+CFLAGS+= -DIWM_DEBUG
 
 .include <bsd.kmod.mk>