Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / input / keyboard / samsung-keypad.c

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 5e80fbf7b5edd50dbfe7fafa43bacf56d562fde3..6b9fdf6cf8e83f017dcdaba0281f8856208c0fc0 100644 (file)
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -463,7 +463,7 @@ static int samsung_keypad_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int samsung_keypad_runtime_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -602,7 +602,6 @@ static struct platform_driver samsung_keypad_driver = {
        .remove         = samsung_keypad_remove,
        .driver         = {
                .name   = "samsung-keypad",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(samsung_keypad_dt_match),
                .pm     = &samsung_keypad_pm_ops,
        },