diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 11:35:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 11:35:58 -0700 |
commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /drivers/pci/pci.c | |
parent | 17af691cd19765b782d891fc50c1568d0f1276b3 (diff) | |
parent | 43a6b76050aa137c51d00eec91d67ac43ac3846e (diff) | |
download | kernel-crypto-346fced899c7390e555cf90cd07d1e56b460d21b.tar.gz kernel-crypto-346fced899c7390e555cf90cd07d1e56b460d21b.tar.xz kernel-crypto-346fced899c7390e555cf90cd07d1e56b460d21b.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index f04b9ffe415..d382bdb7b56 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -334,10 +334,6 @@ EXPORT_SYMBOL(pci_choose_state); /** * pci_save_state - save the PCI configuration space of a device before suspending * @dev: - PCI device that we're dealing with - * @buffer: - buffer to hold config space context - * - * @buffer must be large enough to hold the entire PCI 2.2 config space - * (>= 64 bytes). */ int pci_save_state(struct pci_dev *dev) @@ -352,8 +348,6 @@ pci_save_state(struct pci_dev *dev) /** * pci_restore_state - Restore the saved state of a PCI device * @dev: - PCI device that we're dealing with - * @buffer: - saved PCI config space - * */ int pci_restore_state(struct pci_dev *dev) |