diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 15:06:58 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 15:06:58 -0400 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /drivers/pci/pci.h | |
| parent | 8344b568f5bdc7ee1bba909de3294c6348c36056 (diff) | |
| parent | 0e6859d49ff194e01afc229c996e3aefca1a0539 (diff) | |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index e1d7bbf079b4..e0eff35825a6 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -6,8 +6,7 @@ extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); | |||
| 6 | extern void pci_cleanup_rom(struct pci_dev *dev); | 6 | extern void pci_cleanup_rom(struct pci_dev *dev); |
| 7 | 7 | ||
| 8 | /* Firmware callbacks */ | 8 | /* Firmware callbacks */ |
| 9 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, | 9 | extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev); |
| 10 | pm_message_t state); | ||
| 11 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, | 10 | extern int (*platform_pci_set_power_state)(struct pci_dev *dev, |
| 12 | pci_power_t state); | 11 | pci_power_t state); |
| 13 | 12 | ||