diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 14:51:52 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-20 14:51:52 -0500 |
| commit | 79bf7fc51118e4ffc61a0a8c943b94c394aa3ecc (patch) | |
| tree | 037cb2a89f1e74f5b751a58135a5600fc43a04b5 /include | |
| parent | 47e0ab3f39aec53d9b7ac77dbe11a645e40583f9 (diff) | |
| parent | 92e112fdbb3cb55b43390426501a7efacd893b96 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/checkpatch: Deprecate DEFINE_PCI_DEVICE_TABLE
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 9172cc2a3041..4b7cf4c954fe 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -635,8 +635,7 @@ struct pci_driver { | |||
| 635 | * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table | 635 | * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table |
| 636 | * @_table: device table name | 636 | * @_table: device table name |
| 637 | * | 637 | * |
| 638 | * This macro is used to create a struct pci_device_id array (a device table) | 638 | * This macro is deprecated and should not be used in new code. |
| 639 | * in a generic manner. | ||
| 640 | */ | 639 | */ |
| 641 | #define DEFINE_PCI_DEVICE_TABLE(_table) \ | 640 | #define DEFINE_PCI_DEVICE_TABLE(_table) \ |
| 642 | const struct pci_device_id _table[] | 641 | const struct pci_device_id _table[] |