summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-07-22 16:16:51 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-22 16:44:38 +0100
commita45f82616eaa7e7fcd365ced78d3f0974b991800 (patch)
tree4bfc05baa27ea9727c01285aca9bcb629ba80a32 /include/asm-arm
parent1197b4cd5098fb862180f013a086a81507196a69 (diff)
downloadop-kernel-dev-a45f82616eaa7e7fcd365ced78d3f0974b991800.zip
op-kernel-dev-a45f82616eaa7e7fcd365ced78d3f0974b991800.tar.gz
[ARM] 4518/1: S3C: Rename watchdog configuration options
Rename the S3C24XX configuration options for the watchdog boot controls for moving to the arch/arm/plat-s3c moves. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 bc6817f..b5e6208 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)
#define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)
-/* CONFIG_S3C2410_BOOT_WATCHDOG
+/* CONFIG_S3C_BOOT_WATCHDOG
*
* Simple boot-time watchdog setup, to reboot the system if there is
* any problem with the boot process
*/
-#ifdef CONFIG_S3C2410_BOOT_WATCHDOG
+#ifdef CONFIG_S3C_BOOT_WATCHDOG
#define WDOG_COUNT (0xff00)
@@ -119,7 +119,7 @@ static void arch_decomp_wdog_start(void)
#define arch_decomp_wdog()
#endif
-#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET
+#ifdef CONFIG_S3C_BOOT_ERROR_RESET
static void arch_decomp_error(const char *x)
{
OpenPOWER on IntegriCloud