summaryrefslogtreecommitdiff
path: root/drivers/acpi/ac.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-20 21:42:03 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-20 21:42:03 +0100
commit5e2e46e84b6f77d4f8e51d6e33ff8eb0f47288f2 (patch)
treee7b40c95f8216156a9d169aecd8759ccd6da0009 /drivers/acpi/ac.c
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff)
parentfae9e2a4b1c59d11edfa7c99c34293bf9fbf2bde (diff)
Merge branch 'acpi-pm' into acpi-fan
Diffstat (limited to 'drivers/acpi/ac.c')
-rw-r--r--drivers/acpi/ac.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index e7515aa43d6b..6f190bc2b8b7 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -243,6 +243,8 @@ static int acpi_ac_resume(struct device *dev)
kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
return 0;
}
+#else
+#define acpi_ac_resume NULL
#endif
static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);