diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
| commit | 583e5136f69588ffbc4f0cc5c2c2592f455ef5f6 (patch) | |
| tree | d70ce617254d0e6f9102496dbe2471e39b57eafb /include/linux/acpi.h | |
| parent | c5943c881bfc77b5380f936745bf5f92503d89f5 (diff) | |
| parent | 0aea531326d1a17ccef7d9a538429c5b32cf4f12 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/kernel/setup_64.c
arch/x86/pci/irq.c
arch/x86/pci/pci.h
include/linux/device.h
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ab3fa932faba..ccb8fe2f8a54 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -235,6 +235,9 @@ int acpi_check_region(resource_size_t start, resource_size_t n, int acpi_check_mem_region(resource_size_t start, resource_size_t n, const char *name); +#ifdef CONFIG_PM_SLEEP +void __init acpi_old_suspend_ordering(void); +#endif /* CONFIG_PM_SLEEP */ #else /* CONFIG_ACPI */ static inline int early_acpi_boot_init(void) |