diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-11-05 16:17:58 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-06 15:42:38 -0500 |
| commit | fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658 (patch) | |
| tree | 9270a9aad04aeed7af52d795ee0eb4ba00218597 /include/acpi | |
| parent | 5b881479af4352791e5004b74e3639f1416c5fe4 (diff) | |
| download | lwn-fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658.tar.gz lwn-fefe5ab3d67b0ade6200fec5ed6f2812cbcbb658.zip | |
ACPI: remove CONFIG_ACPI_POWER
Remove CONFIG_ACPI_POWER. It was always set the same as CONFIG_ACPI,
and it had no menu label, so there was no way to set it to anything
other than "y".
The interfaces under CONFIG_ACPI_POWER (acpi_device_sleep_wake(),
acpi_power_transition(), etc) are called unconditionally from the
ACPI core, so we already depend on it always being present.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index cf04c6011c2a..818215f89e7a 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -86,7 +86,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, Power Resource -------------------------------------------------------------------------- */ -#ifdef CONFIG_ACPI_POWER 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); @@ -94,7 +93,6 @@ 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; -#endif /* -------------------------------------------------------------------------- Embedded Controller |