]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined
authorShuah Khan <shuah.kh@samsung.com>
Thu, 13 Feb 2014 03:19:05 +0000 (20:19 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 13 Feb 2014 14:13:44 +0000 (15:13 +0100)
The ACPI AC driver defines acpi_ac_resume() when CONFIG_PM_SLEEP is
defined.  This results in the following compile error when
CONFIG_PM_SLEEP is undefined:

drivers/acpi/ac.c:248:8: error: ‘acpi_ac_resume’ undeclared here (not in a function)

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/ac.c

index e7515aa43d6bd62c3ec0e33fb6781d2a9f2f27a7..6f190bc2b8b784bf7e09425b77c560fa60f04b90 100644 (file)
@@ -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);