aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/s3c2410_defconfig
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/configs/s3c2410_defconfig
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/configs/s3c2410_defconfig')
-rw-r--r--arch/arm/configs/s3c2410_defconfig4
1 files changed, 2 insertions, 2 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
138CONFIG_PLAT_S3C24XX=y 138CONFIG_PLAT_S3C24XX=y
139CONFIG_CPU_S3C244X=y 139CONFIG_CPU_S3C244X=y
140CONFIG_PM_SIMTEC=y 140CONFIG_PM_SIMTEC=y
141# CONFIG_S3C2410_BOOT_WATCHDOG is not set 141# CONFIG_S3C_BOOT_WATCHDOG is not set
142# CONFIG_S3C2410_BOOT_ERROR_RESET is not set 142# CONFIG_S3C_BOOT_ERROR_RESET is not set
143# CONFIG_S3C2410_PM_DEBUG is not set 143# CONFIG_S3C2410_PM_DEBUG is not set
144# CONFIG_S3C2410_PM_CHECK is not set 144# CONFIG_S3C2410_PM_CHECK is not set
145CONFIG_S3C_LOWLEVEL_UART_PORT=0 145CONFIG_S3C_LOWLEVEL_UART_PORT=0