Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-s5pv210 / pm.c

diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 21b4b13c5ab787f0707c00c5125b285f73dcdd60..7d69666de5ba2dd6b3c5c705d608ba4ad182767b 100644 (file)
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -155,13 +155,6 @@ static const struct platform_suspend_ops s5pv210_suspend_ops = {
  */
 static void s5pv210_pm_resume(void)
 {
-       u32 tmp;
-
-       tmp = __raw_readl(S5P_OTHERS);
-       tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\
-               S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);
-       __raw_writel(tmp , S5P_OTHERS);
-
        s3c_pm_do_restore_core(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
 }