diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 03:44:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 03:44:08 -0400 |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /include/linux/pci.h | |
| parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
| parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 559d02897075..ff5bccb87136 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -1479,6 +1479,7 @@ void pci_request_acs(void); | |||
| 1479 | #define PCI_VPD_RO_KEYWORD_PARTNO "PN" | 1479 | #define PCI_VPD_RO_KEYWORD_PARTNO "PN" |
| 1480 | #define PCI_VPD_RO_KEYWORD_MFR_ID "MN" | 1480 | #define PCI_VPD_RO_KEYWORD_MFR_ID "MN" |
| 1481 | #define PCI_VPD_RO_KEYWORD_VENDOR0 "V0" | 1481 | #define PCI_VPD_RO_KEYWORD_VENDOR0 "V0" |
| 1482 | #define PCI_VPD_RO_KEYWORD_CHKSUM "RV" | ||
| 1482 | 1483 | ||
| 1483 | /** | 1484 | /** |
| 1484 | * pci_vpd_lrdt_size - Extracts the Large Resource Data Type length | 1485 | * pci_vpd_lrdt_size - Extracts the Large Resource Data Type length |