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.c | |
| 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.c')
| -rw-r--r-- | drivers/pci/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 03fd59e80fef..c95485398687 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1604,6 +1604,7 @@ early_param("pci", pci_setup); | |||
| 1604 | device_initcall(pci_init); | 1604 | device_initcall(pci_init); |
| 1605 | 1605 | ||
| 1606 | EXPORT_SYMBOL_GPL(pci_restore_bars); | 1606 | EXPORT_SYMBOL_GPL(pci_restore_bars); |
| 1607 | EXPORT_SYMBOL(__pci_reenable_device); | ||
| 1607 | EXPORT_SYMBOL(pci_enable_device_bars); | 1608 | EXPORT_SYMBOL(pci_enable_device_bars); |
| 1608 | EXPORT_SYMBOL(pci_enable_device); | 1609 | EXPORT_SYMBOL(pci_enable_device); |
| 1609 | EXPORT_SYMBOL(pcim_enable_device); | 1610 | EXPORT_SYMBOL(pcim_enable_device); |