Author: rpaulo
Date: Sat Aug  8 21:09:41 2015
New Revision: 286476
URL: https://svnweb.freebsd.org/changeset/base/286476

Log:
  Build the iwm and iwmfw modules by default on x86.

Modified:
  head/sys/modules/Makefile
  head/sys/modules/iwm/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile   Sat Aug  8 21:08:35 2015        (r286475)
+++ head/sys/modules/Makefile   Sat Aug  8 21:09:41 2015        (r286476)
@@ -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
-_ipw=          ipw
-.if ${MK_SOURCELESS_UCODE} != "no"
-_ipwfw=                ipwfw
-.endif
 _isci=         isci
+_ipw=          ipw
 _iwi=          iwi
-.if ${MK_SOURCELESS_UCODE} != "no"
-_iwifw=                iwifw
-.endif
+_iwm=          iwm
 _iwn=          iwn
+_ixgb=         ixgb
 .if ${MK_SOURCELESS_UCODE} != "no"
+_ipwfw=                ipwfw
+_iwifw=                iwifw
+_iwmfw=                iwmfw
 _iwnfw=                iwnfw
 .endif
-_ixgb=         ixgb
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=         mlx4
 _mlx4ib=       mlx4ib

Modified: head/sys/modules/iwm/Makefile
==============================================================================
--- head/sys/modules/iwm/Makefile       Sat Aug  8 21:08:35 2015        
(r286475)
+++ head/sys/modules/iwm/Makefile       Sat Aug  8 21:09:41 2015        
(r286476)
@@ -9,9 +9,8 @@ SRCS+=  if_iwm_mac_ctxt.c if_iwm_phy_ctxt
 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>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to