diff options
| -rw-r--r-- | Documentation/pci.txt | 4 | ||||
| -rw-r--r-- | include/linux/pci.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index bb7bd27d4682..d2c2e6e2b224 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt | |||
| @@ -123,7 +123,7 @@ 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 DECLARE_PCI_DEVICE_TABLE is the preferred | 126 | all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred |
| 127 | method of declaring the table. Each entry consists of: | 127 | method of declaring the table. Each entry consists of: |
| 128 | 128 | ||
| 129 | vendor,device Vendor and device ID to match (or PCI_ANY_ID) | 129 | vendor,device Vendor and device ID to match (or PCI_ANY_ID) |
| @@ -193,7 +193,7 @@ Tips on when/where to use the above attributes: | |||
| 193 | o Do not mark the struct pci_driver. | 193 | o Do not mark the struct pci_driver. |
| 194 | 194 | ||
| 195 | o The ID table array should be marked __devinitconst; this is done | 195 | o The ID table array should be marked __devinitconst; this is done |
| 196 | automatically if the table is declared with DECLARE_PCI_DEVICE_TABLE(). | 196 | automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE(). |
| 197 | 197 | ||
| 198 | o The probe() and remove() functions should be marked __devinit | 198 | o The probe() and remove() functions should be marked __devinit |
| 199 | and __devexit respectively. All initialization functions | 199 | and __devexit respectively. All initialization functions |
diff --git a/include/linux/pci.h b/include/linux/pci.h index f3165e7ac431..38eff1947750 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -389,13 +389,13 @@ struct pci_driver { | |||
| 389 | #define to_pci_driver(drv) container_of(drv, struct pci_driver, driver) | 389 | #define to_pci_driver(drv) container_of(drv, struct pci_driver, driver) |
| 390 | 390 | ||
| 391 | /** | 391 | /** |
| 392 | * DECLARE_PCI_DEVICE_TABLE - macro used to describe a pci device table | 392 | * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table |
| 393 | * @_table: device table name | 393 | * @_table: device table name |
| 394 | * | 394 | * |
| 395 | * This macro is used to create a struct pci_device_id array (a device table) | 395 | * This macro is used to create a struct pci_device_id array (a device table) |
| 396 | * in a generic manner. | 396 | * in a generic manner. |
| 397 | */ | 397 | */ |
| 398 | #define DECLARE_PCI_DEVICE_TABLE(_table) \ | 398 | #define DEFINE_PCI_DEVICE_TABLE(_table) \ |
| 399 | const struct pci_device_id _table[] __devinitconst | 399 | const struct pci_device_id _table[] __devinitconst |
| 400 | 400 | ||
| 401 | /** | 401 | /** |
