From d0559ebc19a41d5b56ec4fc135f1e84f533e3e8a Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Thu, 5 Nov 2009 12:05:11 +0900 Subject: [PATCH] --- yaml --- r: 174779 b: refs/heads/master c: 0efea0006335a2425b1a12a2ad35efad626fe353 h: refs/heads/master i: 174777: 3d0472b9a32d26f8a22eaa564c979896678f4b9f 174775: 1163b96e943f76bc59b7dd396e3723ba311ec154 v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 1 + trunk/include/linux/pci.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 10dd0d79e723..4ef61bd05baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e5ad9679016275d422e36b12a98b0927d76f556 +refs/heads/master: 0efea0006335a2425b1a12a2ad35efad626fe353 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 623086f9ba84..54b9f1501487 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -692,6 +692,7 @@ static void set_pcie_port_type(struct pci_dev *pdev) if (!pos) return; pdev->is_pcie = 1; + pdev->pcie_cap = pos; pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, ®16); pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; } diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 86c31ac454d1..233b3a092035 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -218,6 +218,7 @@ struct pci_dev { unsigned int class; /* 3 bytes: (base,sub,prog-if) */ u8 revision; /* PCI revision, low byte of class word */ u8 hdr_type; /* PCI header type (`multi' flag masked out) */ + u8 pcie_cap; /* PCI-E capability offset */ u8 pcie_type; /* PCI-E device/port type */ u8 rom_base_reg; /* which config register controls the ROM */ u8 pin; /* which interrupt pin this device uses */