---

yaml --- r: 174779 b: refs/heads/master c: 0efea00 h: refs/heads/master i: 174777: 3d0472b 174775: 1163b96 v: v3
git-mirror · Nov 6, 2009 · d0559eb · d0559eb
1 parent 7aa96bf
commit d0559eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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, &reg16);
 	pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4;
 }

diff --git 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 */