diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:58:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:58:51 -0400 |
| commit | 1e66239e23dd0422baf891bf6af0b65ac632b676 (patch) | |
| tree | 5646c17cef8cea3e37b35ff6b0d54b8e5602e26e /drivers/pci/pci.h | |
| parent | 7742c0bc8594cf1bcbad1f3e876acae5b644dc7b (diff) | |
| parent | 64a8170975947978ea4094dd6c4b1f41119d6ae6 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_hpt37x: Fix 2.6.22 clock PLL regression
pata_ali: Correct HP detect
ata_piix: fix suspend/resume for some TOSHIBA laptops
PCI: export __pci_reenable_device()
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 3fec13d3add7..7b696cd66dc5 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* Functions internal to the PCI core code */ | 1 | /* Functions internal to the PCI core code */ |
| 2 | 2 | ||
| 3 | extern int __must_check __pci_reenable_device(struct pci_dev *); | ||
| 4 | extern int pci_uevent(struct device *dev, char **envp, int num_envp, | 3 | extern int pci_uevent(struct device *dev, char **envp, int num_envp, |
| 5 | char *buffer, int buffer_size); | 4 | char *buffer, int buffer_size); |
| 6 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); | 5 | extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); |