diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-28 03:33:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 16:53:59 -0700 |
| commit | 673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch) | |
| tree | a795ee922db699a8b4cb893ef5809399f1591ba6 /drivers/pnp | |
| parent | 296699de6bdc717189a331ab6bbe90e05c94db06 (diff) | |
| download | linux-3.10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.gz linux-3.10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.bz2 linux-3.10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.zip | |
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the
new CONFIG_PM_SLEEP option.
Signed-off-by: Len Brown <len.brown@intel.com>
[ Modified to work with the PM config setup changes. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 6a2a3c2f4d5..616fc72190b 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -127,6 +127,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev) return ACPI_FAILURE(status) ? -ENODEV : 0; } +#ifdef CONFIG_ACPI_SLEEP static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) { return acpi_bus_set_power((acpi_handle) dev->data, @@ -140,14 +141,17 @@ static int pnpacpi_resume(struct pnp_dev *dev) { return acpi_bus_set_power((acpi_handle) dev->data, ACPI_STATE_D0); } +#endif static struct pnp_protocol pnpacpi_protocol = { .name = "Plug and Play ACPI", .get = pnpacpi_get_resources, .set = pnpacpi_set_resources, .disable = pnpacpi_disable_resources, +#ifdef CONFIG_ACPI_SLEEP .suspend = pnpacpi_suspend, .resume = pnpacpi_resume, +#endif }; static int __init pnpacpi_add_device(struct acpi_device *device) |