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

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-s5pv210 / regs-clock.h

diff --git a/arch/arm/mach-s5pv210/regs-clock.h b/arch/arm/mach-s5pv210/regs-clock.h
index 4640f0f03c12ccaaf01b8fb5f72690a6f0eb01a9..fb3eb77412dbdf2d6321bfe278c81970631aab72 100644 (file)
--- a/arch/arm/mach-s5pv210/regs-clock.h
+++ b/arch/arm/mach-s5pv210/regs-clock.h
@@ -188,10 +188,6 @@
 #define S5P_SLEEP_CFG_USBOSC_EN                (1 << 1)
 
 /* OTHERS Resgister */
-#define S5P_OTHERS_RET_IO              (1 << 31)
-#define S5P_OTHERS_RET_CF              (1 << 30)
-#define S5P_OTHERS_RET_MMC             (1 << 29)
-#define S5P_OTHERS_RET_UART            (1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK                (1 << 16)
 
 /* S5P_DAC_CONTROL */