From owner-svn-src-all@FreeBSD.ORG  Wed Jan 14 05:41:29 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 85FE3882;
 Wed, 14 Jan 2015 05:41:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 72CE7993;
 Wed, 14 Jan 2015 05:41:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0E5fTgb069984;
 Wed, 14 Jan 2015 05:41:29 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0E5fTtg069982;
 Wed, 14 Jan 2015 05:41:29 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201501140541.t0E5fTtg069982@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 14 Jan 2015 05:41:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277162 - in head/sys/modules: cardbus cbb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jan 2015 05:41:29 -0000

Author: imp
Date: Wed Jan 14 05:41:28 2015
New Revision: 277162
URL: https://svnweb.freebsd.org/changeset/base/277162

Log:
  On x86 force NEW_PCIB, since that's the default. While this option
  would be picked up for kernel builds, it isn't picked up for
  old-fashioned builds. Without this option, PCI bus numbers are busted
  for modules build iteratively.

Modified:
  head/sys/modules/cardbus/Makefile
  head/sys/modules/cbb/Makefile

Modified: head/sys/modules/cardbus/Makefile
==============================================================================
--- head/sys/modules/cardbus/Makefile	Wed Jan 14 05:32:16 2015	(r277161)
+++ head/sys/modules/cardbus/Makefile	Wed Jan 14 05:41:28 2015	(r277162)
@@ -6,4 +6,8 @@ KMOD=	cardbus
 SRCS=	cardbus.c cardbus_cis.c cardbus_device.c \
 	device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS += -DNEW_PCIB
+.endif
+
 .include <bsd.kmod.mk>

Modified: head/sys/modules/cbb/Makefile
==============================================================================
--- head/sys/modules/cbb/Makefile	Wed Jan 14 05:32:16 2015	(r277161)
+++ head/sys/modules/cbb/Makefile	Wed Jan 14 05:41:28 2015	(r277162)
@@ -6,4 +6,8 @@ KMOD=	cbb
 SRCS=	pccbb.c pccbb_isa.c pccbb_pci.c \
 	device_if.h bus_if.h power_if.h card_if.h isa_if.h pci_if.h pcib_if.h
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS += -DNEW_PCIB
+.endif
+
 .include <bsd.kmod.mk>