From 4499b76e4664773543f64b0700d8bc6397a424bf Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Fri, 29 Apr 2016 16:54:25 +0900 Subject: [PATCH] i2c: s3c2410: Change CONFIG_PM_RUNTIME to CONFIG_PM This patch chagnes CONFIG_PM_RUNTIME to CONFIG_PM in exynos normal I2C driver. This patch shoud be applies to sync with below commit. commit 464ed18ebdb6236fcff59d2a35d4d2e28668435a PM: Eliminate CONFIG_PM_RUNTIME Having switched over all of the users of CONFIG_PM_RUNTIME to use CONFIG_PM directly, turn the latter into a user-selectable option and drop the former entirely from the tree. Change-Id: I2ef02c977eeb783bb3b69d95d284e81379624023 Signed-off-by: Youngmin Nam --- drivers/i2c/busses/i2c-s3c2410.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f0a9b0d81567..f472e9321631 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1339,7 +1339,7 @@ static int s3c24xx_i2c_resume_noirq(struct device *dev) } #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int s3c24xx_i2c_runtime_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -1358,7 +1358,7 @@ static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { .suspend_noirq = s3c24xx_i2c_suspend_noirq, .resume_noirq = s3c24xx_i2c_resume_noirq, #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM .runtime_resume = s3c24xx_i2c_runtime_resume, #endif }; -- 2.20.1