Merge commit 'v2.6.33-rc5' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / adp5588-keys.c

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 6737fe4c0f1237508095a35b9e99ed8d41fb0927..b5142d2d5112a0470cf34e924e9c0063124d56f3 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -320,7 +320,7 @@ static int adp5588_resume(struct device *dev)
        return 0;
 }
 
-static struct dev_pm_ops adp5588_dev_pm_ops = {
+static const struct dev_pm_ops adp5588_dev_pm_ops = {
        .suspend = adp5588_suspend,
        .resume  = adp5588_resume,
 };