aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-07-22 11:16:51 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-22 11:44:38 -0400
commita45f82616eaa7e7fcd365ced78d3f0974b991800 (patch)
tree4bfc05baa27ea9727c01285aca9bcb629ba80a32 /arch/arm/plat-s3c
parent1197b4cd5098fb862180f013a086a81507196a69 (diff)
[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 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 88d797099bf0..31656c33e05e 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -42,16 +42,16 @@ config CPU_LLSERIAL_S3C2440
42 42
43comment "Boot options" 43comment "Boot options"
44 44
45config S3C2410_BOOT_WATCHDOG 45config S3C_BOOT_WATCHDOG
46 bool "S3C2410 Initialisation watchdog" 46 bool "S3C Initialisation watchdog"
47 depends on PLAT_S3C && S3C2410_WATCHDOG 47 depends on PLAT_S3C && S3C2410_WATCHDOG
48 help 48 help
49 Say y to enable the watchdog during the kernel decompression 49 Say y to enable the watchdog during the kernel decompression
50 stage. If the kernel fails to uncompress, then the watchdog 50 stage. If the kernel fails to uncompress, then the watchdog
51 will trigger a reset and the system should restart. 51 will trigger a reset and the system should restart.
52 52
53config S3C2410_BOOT_ERROR_RESET 53config S3C_BOOT_ERROR_RESET
54 bool "S3C2410 Reboot on decompression error" 54 bool "S3C Reboot on decompression error"
55 depends on PLAT_S3C 55 depends on PLAT_S3C
56 help 56 help
57 Say y here to use the watchdog to reset the system if the 57 Say y here to use the watchdog to reset the system if the