aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/PCI
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:51:52 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:51:52 -0700
commit79bf7fc51118e4ffc61a0a8c943b94c394aa3ecc (patch)
tree037cb2a89f1e74f5b751a58135a5600fc43a04b5 /Documentation/PCI
parent47e0ab3f39aec53d9b7ac77dbe11a645e40583f9 (diff)
parent92e112fdbb3cb55b43390426501a7efacd893b96 (diff)
Merge branch 'pci/misc' into next
* pci/misc: PCI/checkpatch: Deprecate DEFINE_PCI_DEVICE_TABLE
Diffstat (limited to 'Documentation/PCI')
-rw-r--r--Documentation/PCI/pci.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt
index 6f458564d625..9518006f6675 100644
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -123,8 +123,10 @@ initialization with a pointer to a structure describing the driver
The ID table is an array of struct pci_device_id entries ending with an
-all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred
-method of declaring the table. Each entry consists of:
+all-zero entry. Definitions with static const are generally preferred.
+Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
+
+Each entry consists of:
vendor,device Vendor and device ID to match (or PCI_ANY_ID)

Privacy Policy