diff options
| -rw-r--r-- | arch/arm/plat-s3c/pm.c | 12 | ||||
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index 422dea207b0..889f191f835 100644 --- a/arch/arm/plat-s3c/pm.c +++ b/arch/arm/plat-s3c/pm.c @@ -18,7 +18,6 @@ #include <linux/delay.h> #include <linux/serial_core.h> #include <linux/io.h> -#include <linux/regulator/machine.h> #include <asm/cacheflush.h> #include <mach/hardware.h> @@ -353,22 +352,11 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } -static int s3c_pm_begin(suspend_state_t state) -{ - int ret = 0; - -#ifdef CONFIG_REGULATOR - ret = regulator_suspend_prepare(state); -#endif - return ret; -} - static struct platform_suspend_ops s3c_pm_ops = { .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, .valid = suspend_valid_only_mem, - .begin = s3c_pm_begin, }; /* s3c_pm_init diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index 343f43e2392..d284200e8ab 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -249,8 +249,6 @@ struct regulator_ops pcf50633_regulator_ops = { .enable = pcf50633_regulator_enable, .disable = pcf50633_regulator_disable, .is_enabled = pcf50633_regulator_is_enabled, - .set_suspend_enable = pcf50633_regulator_enable, - .set_suspend_disable = pcf50633_regulator_disable, }; static struct regulator_desc regulators[] = { |