diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-20 21:42:03 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-20 21:42:03 +0100 |
| commit | 5e2e46e84b6f77d4f8e51d6e33ff8eb0f47288f2 (patch) | |
| tree | e7b40c95f8216156a9d169aecd8759ccd6da0009 /drivers/acpi/button.c | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| parent | fae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde (diff) | |
Merge branch 'acpi-pm' into acpi-fan
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 11c11f6b8fa1..714e957a871a 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); #ifdef CONFIG_PM_SLEEP static int acpi_button_resume(struct device *dev); +#else +#define acpi_button_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume); |