From a1776cbb128264d873b2f30ba9a2b17f8c7aa5fd Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Wed, 31 Jan 2007 23:48:12 -0800
Subject: [PATCH] --- yaml --- r: 46027 b: refs/heads/master c:
 cb7468ef4cce8f240604b80b82ac157fa9930e94 h: refs/heads/master i:   46025:
 d21a98270bc3aee057cccadefb2ec15ebc80a23c   46023:
 0367b6fab2c7382a9339726c1990609dca0fb0a7 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/quirks.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3c173c16b3cd..a40b2435233e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04add672cf98a788e9e0d753b2ccfa4a3a0caf56
+refs/heads/master: cb7468ef4cce8f240604b80b82ac157fa9930e94
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 16945c2ba2ca..dcc0c1ab95ed 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -661,9 +661,11 @@ static void quirk_via_bridge(struct pci_dev *dev)
 	/* See what bridge we have and find the device ranges */
 	switch (dev->device) {
 	case PCI_DEVICE_ID_VIA_82C686:
-		/* 82C686 is special */
-		via_vlink_dev_lo = 7;
-		via_vlink_dev_hi = 7;
+		/* The VT82C686 is special, it attaches to PCI and can have
+		   any device number. All its subdevices are functions of
+		   that single device. */
+		via_vlink_dev_lo = PCI_SLOT(dev->devfn);
+		via_vlink_dev_hi = PCI_SLOT(dev->devfn);
 		break;
 	case PCI_DEVICE_ID_VIA_8237:
 	case PCI_DEVICE_ID_VIA_8237A: