svn commit: r283305 - stable/10/sys/dev/pci

[John Baldwin]

Author: jhb
Date: Fri May 22 23:54:12 2015
New Revision: 283305
URL: https://svnweb.freebsd.org/changeset/base/283305

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

Modified:
  stable/10/sys/dev/pci/pci_pci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/pci/pci_pci.c
==============================================================================
--- stable/10/sys/dev/pci/pci_pci.c	Fri May 22 23:07:55 2015	(r283304)
+++ stable/10/sys/dev/pci/pci_pci.c	Fri May 22 23:54:12 2015	(r283305)
@@ -946,7 +946,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;
@@ -972,7 +972,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:
 	{