aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/plat-s3c/uncompress.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/plat-s3c/uncompress.h b/include/asm-arm/plat-s3c/uncompress.h
index bc6817f91e2f..b5e6208175d1 100644
--- a/include/asm-arm/plat-s3c/uncompress.h
+++ b/include/asm-arm/plat-s3c/uncompress.h
@@ -92,13 +92,13 @@ static inline void flush(void)
92 92
93#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0) 93#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)
94 94
95/* CONFIG_S3C2410_BOOT_WATCHDOG 95/* CONFIG_S3C_BOOT_WATCHDOG
96 * 96 *
97 * Simple boot-time watchdog setup, to reboot the system if there is 97 * Simple boot-time watchdog setup, to reboot the system if there is
98 * any problem with the boot process 98 * any problem with the boot process
99*/ 99*/
100 100
101#ifdef CONFIG_S3C2410_BOOT_WATCHDOG 101#ifdef CONFIG_S3C_BOOT_WATCHDOG
102 102
103#define WDOG_COUNT (0xff00) 103#define WDOG_COUNT (0xff00)
104 104
@@ -119,7 +119,7 @@ static void arch_decomp_wdog_start(void)
119#define arch_decomp_wdog() 119#define arch_decomp_wdog()
120#endif 120#endif
121 121
122#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET 122#ifdef CONFIG_S3C_BOOT_ERROR_RESET
123 123
124static void arch_decomp_error(const char *x) 124static void arch_decomp_error(const char *x)
125{ 125{