diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
| commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
| tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /include | |
| parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
| parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) | |
| download | op-kernel-dev-9a38f4eec57cc5104b6a85bc6d0a91b268fbe803.zip op-kernel-dev-9a38f4eec57cc5104b6a85bc6d0a91b268fbe803.tar.gz | |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 5fc1bb0..241d227 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -99,24 +99,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, int bus); /* -------------------------------------------------------------------------- - Power Resource - -------------------------------------------------------------------------- */ - -int acpi_device_sleep_wake(struct acpi_device *dev, - int enable, int sleep_state, int dev_state); -int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state); -int acpi_disable_wakeup_device_power(struct acpi_device *dev); -int acpi_power_get_inferred_state(struct acpi_device *device); -int acpi_power_transition(struct acpi_device *device, int state); -extern int acpi_power_nocheck; - -/* -------------------------------------------------------------------------- - Embedded Controller - -------------------------------------------------------------------------- */ -int acpi_ec_ecdt_probe(void); -int acpi_boot_ec_enable(void); - -/* -------------------------------------------------------------------------- Processor -------------------------------------------------------------------------- */ @@ -165,9 +147,4 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) } #endif -/*-------------------------------------------------------------------------- - Suspend/Resume - -------------------------------------------------------------------------- */ -extern int acpi_sleep_init(void); - #endif /*__ACPI_DRIVERS_H__*/ |
