Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Apr 2015 21:47:51 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281872 - head/sys/dev/pci
Message-ID:  <201504222147.t3MLlpwd060507@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Wed Apr 22 21:47:51 2015
New Revision: 281872
URL: https://svnweb.freebsd.org/changeset/base/281872

Log:
  Fix some incorrect #if conditions around older workarounds for bus
  numbering goofs.
  
  MFC after:	1 week

Modified:
  head/sys/dev/pci/pci_pci.c

Modified: head/sys/dev/pci/pci_pci.c
==============================================================================
--- head/sys/dev/pci/pci_pci.c	Wed Apr 22 21:41:59 2015	(r281871)
+++ head/sys/dev/pci/pci_pci.c	Wed Apr 22 21:47:51 2015	(r281872)
@@ -950,7 +950,7 @@ pcib_attach_common(device_t dev)
      * Quirk handling.
      */
     switch (pci_get_devid(dev)) {
-#if !defined(NEW_PCIB) && !defined(PCI_RES_BUS)
+#if !(defined(NEW_PCIB) && defined(PCI_RES_BUS))
     case 0x12258086:		/* Intel 82454KX/GX (Orion) */
 	{
 	    uint8_t	supbus;
@@ -976,7 +976,7 @@ pcib_attach_common(device_t dev)
 	sc->flags |= PCIB_SUBTRACTIVE;
 	break;
 
-#if !defined(NEW_PCIB) && !defined(PCI_RES_BUS)
+#if !(defined(NEW_PCIB) && defined(PCI_RES_BUS))
     /* Compaq R3000 BIOS sets wrong subordinate bus number. */
     case 0x00dd10de:
 	{



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504222147.t3MLlpwd060507>