summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
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 /arch/arm/plat-s3c
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 '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 88d7970..31656c3 100644
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -42,16 +42,16 @@ config CPU_LLSERIAL_S3C2440
comment "Boot options"
-config S3C2410_BOOT_WATCHDOG
- bool "S3C2410 Initialisation watchdog"
+config S3C_BOOT_WATCHDOG
+ bool "S3C Initialisation watchdog"
depends on PLAT_S3C && S3C2410_WATCHDOG
help
Say y to enable the watchdog during the kernel decompression
stage. If the kernel fails to uncompress, then the watchdog
will trigger a reset and the system should restart.
-config S3C2410_BOOT_ERROR_RESET
- bool "S3C2410 Reboot on decompression error"
+config S3C_BOOT_ERROR_RESET
+ bool "S3C Reboot on decompression error"
depends on PLAT_S3C
help
Say y here to use the watchdog to reset the system if the
OpenPOWER on IntegriCloud