diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2007-07-22 17:16:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-22 17:44:38 +0200 |
| commit | a45f82616eaa7e7fcd365ced78d3f0974b991800 (patch) | |
| tree | 4bfc05baa27ea9727c01285aca9bcb629ba80a32 /arch/arm | |
| parent | [ARM] 4517/1: S3C: Fix debug macros for ARM926 output (diff) | |
| download | linux-a45f82616eaa7e7fcd365ced78d3f0974b991800.tar.xz linux-a45f82616eaa7e7fcd365ced78d3f0974b991800.zip | |
[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')
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/Kconfig | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index ada89b6c3919..f8a1645b3d4a 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -138,8 +138,8 @@ CONFIG_ARCH_S3C2410=y CONFIG_PLAT_S3C24XX=y CONFIG_CPU_S3C244X=y CONFIG_PM_SIMTEC=y -# CONFIG_S3C2410_BOOT_WATCHDOG is not set -# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_S3C_BOOT_WATCHDOG is not set +# CONFIG_S3C_BOOT_ERROR_RESET is not set # CONFIG_S3C2410_PM_DEBUG is not set # CONFIG_S3C2410_PM_CHECK is not set CONFIG_S3C_LOWLEVEL_UART_PORT=0 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 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 |