From owner-p4-projects@FreeBSD.ORG  Thu Dec 12 19:37:43 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B8FC2158; Thu, 12 Dec 2013 19:37:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7C0B9155
 for <perforce@freebsd.org>; Thu, 12 Dec 2013 19:37:43 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6705310F8
 for <perforce@freebsd.org>; Thu, 12 Dec 2013 19:37:43 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBCJbhLk010134
 for <perforce@freebsd.org>; Thu, 12 Dec 2013 19:37:43 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBCJbh4Z010131
 for perforce@freebsd.org; Thu, 12 Dec 2013 19:37:43 GMT
 (envelope-from jhb@freebsd.org)
Date: Thu, 12 Dec 2013 19:37:43 GMT
Message-Id: <201312121937.rBCJbh4Z010131@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1189085 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Dec 2013 19:37:43 -0000

http://p4web.freebsd.org/@@1189085?ac=10

Change 1189085 by jhb@jhb_jhbbsd on 2013/12/12 19:37:14

	Tidy.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#44 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#44 (text+ko) ====

@@ -950,8 +950,7 @@
      * Quirk handling.
      */
     switch (pci_get_devid(dev)) {
-#if 0
-    /* XXX: This is now broken */
+#if !defined(NEW_PCIB) && !defined(PCI_RES_BUS)
     case 0x12258086:		/* Intel 82454KX/GX (Orion) */
 	{
 	    uint8_t	supbus;
@@ -963,6 +962,8 @@
 	    }
 	    break;
 	}
+#else
+    /* XXX: This is now broken */
 #endif
 
     /*