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
+all-zero entry.  Definitions with static const are generally preferred.
-method of declaring the table.  Each entry consists of:
+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)

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
123		123
124		124
125	The ID table is an array of struct pci_device_id entries ending with an	125	The ID table is an array of struct pci_device_id entries ending with an
126	all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred	126	all-zero entry. Definitions with static const are generally preferred.
127	method of declaring the table. Each entry consists of:	127	Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
		128
		129	Each entry consists of:
128		130
129	vendor,device Vendor and device ID to match (or PCI_ANY_ID)	131	vendor,device Vendor and device ID to match (or PCI_ANY_ID)
130		132