diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:37 -0800 |
commit | 46fd906131bfae831b56a1e64dd94956626fc07c (patch) | |
tree | 2c3992b6ffe0994498c468c9ef57eaad106969d6 /drivers/pci/pci-driver.c | |
parent | 39470bf24d93927bb27929b9f0d52ff5d608cfcb (diff) | |
parent | ae9608af9e300395ec032479621f32688c121141 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: fix pci-driver kernel-doc
PCI: rework Documentation/pci.txt
PCI: Unhide the SMBus on the Asus P4P800-X
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index b8d2385e29b..92d5e8db0de 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -150,8 +150,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, } /** - * pci_match_device - Tell if a PCI device structure has a matching - * PCI device id structure + * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure * @drv: the PCI driver to match against * @dev: the PCI device structure to match against * |