From owner-svn-src-all@FreeBSD.ORG  Mon Feb  2 22:06:21 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3634A106564A;
	Mon,  2 Feb 2009 22:06:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24C198FC12;
	Mon,  2 Feb 2009 22:06:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n12M6KWm008848;
	Mon, 2 Feb 2009 22:06:20 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n12M6KPD008847;
	Mon, 2 Feb 2009 22:06:20 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200902022206.n12M6KPD008847@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 2 Feb 2009 22:06:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188033 - head/sys/dev/cardbus
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 02 Feb 2009 22:06:21 -0000

Author: jhb
Date: Mon Feb  2 22:06:20 2009
New Revision: 188033
URL: http://svn.freebsd.org/changeset/base/188033

Log:
  Goof, catch up to constant rename (I renamed it to match the overall PCI
  style of having register offsets start with PCIR_* rather than PCI_*).
  
  Submitted by:	rss

Modified:
  head/sys/dev/cardbus/cardbus.c

Modified: head/sys/dev/cardbus/cardbus.c
==============================================================================
--- head/sys/dev/cardbus/cardbus.c	Mon Feb  2 22:04:40 2009	(r188032)
+++ head/sys/dev/cardbus/cardbus.c	Mon Feb  2 22:06:20 2009	(r188033)
@@ -143,7 +143,7 @@ cardbus_device_setup_regs(pcicfgregs *cf
 	 * Some cards power up with garbage in their BARs.  This
 	 * code clears all that junk out.
 	 */
-	for (i = 0; i < PCI_MAX_BAR_0; i++)
+	for (i = 0; i < PCIR_MAX_BAR_0; i++)
 		pci_write_config(dev, PCIR_BAR(i), 0, 4);
 
 	cfg->intline =