From owner-svn-src-head@freebsd.org  Sat Aug  8 21:09:42 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8E819B6AC9;
 Sat,  8 Aug 2015 21:09:42 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9E5C999;
 Sat,  8 Aug 2015 21:09:42 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t78L9gsg051737;
 Sat, 8 Aug 2015 21:09:42 GMT (envelope-from rpaulo@FreeBSD.org)
Received: (from rpaulo@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t78L9gSc051733;
 Sat, 8 Aug 2015 21:09:42 GMT (envelope-from rpaulo@FreeBSD.org)
Message-Id: <201508082109.t78L9gSc051733@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rpaulo set sender to
 rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 8 Aug 2015 21:09:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286476 - in head/sys/modules: . iwm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Aug 2015 21:09:43 -0000

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>