diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 07:44:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 07:44:31 +0100 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /Documentation/pci.txt | |
| parent | [IPV4]: esp_output() misannotations (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-2f633928cbba8a5858bb39b11e7219a41b0fbef5.tar.xz linux-2f633928cbba8a5858bb39b11e7219a41b0fbef5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/pci.txt')
| -rw-r--r-- | Documentation/pci.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index 72b20c639596..d2c2e6e2b224 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt @@ -123,7 +123,8 @@ 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. Each entry consists of: +all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred +method of declaring the table. Each entry consists of: vendor,device Vendor and device ID to match (or PCI_ANY_ID) @@ -191,7 +192,8 @@ Tips on when/where to use the above attributes: o Do not mark the struct pci_driver. - o The ID table array should be marked __devinitdata. + o The ID table array should be marked __devinitconst; this is done + automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE(). o The probe() and remove() functions should be marked __devinit and __devexit respectively. All initialization functions |