diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:37:10 -0800 |
| commit | 12f981f9028da2402c236544c78b8378a278f830 (patch) | |
| tree | 7983fdf95d77ad241e09db861bb90a629eee753f /Documentation | |
| parent | 10955d2251387df3997d8b9b6c572dfad9f23dd0 (diff) | |
| parent | c1ef5cbd03921047c2eafb998132e562043678a7 (diff) | |
| download | kernel-crypto-12f981f9028da2402c236544c78b8378a278f830.tar.gz kernel-crypto-12f981f9028da2402c236544c78b8378a278f830.tar.xz kernel-crypto-12f981f9028da2402c236544c78b8378a278f830.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
pci: hotplug: pciehp: fix error code path in hpc_power_off_slot
PCI: Add DECLARE_PCI_DEVICE_TABLE macro
PCI: fix up error messages for pci_bus registering
PCI: fix section mismatch warning in pci_scan_child_bus
PCI: consolidate duplicated MSI enable functions
PCI: use dev_printk in quirk messages
Diffstat (limited to 'Documentation')
| -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 72b20c63959..bb7bd27d468 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 DECLARE_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 DECLARE_PCI_DEVICE_TABLE(). o The probe() and remove() functions should be marked __devinit and __devexit respectively. All initialization functions |