summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 19:51:40 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 19:51:40 +0900
commit6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch)
tree6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /arch/arm/mach-s3c64xx/Kconfig
parenta2f7bffa29f18266bc7b55a2b47a5fa1274ed53f (diff)
parent5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (diff)
downloadop-kernel-dev-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.zip
op-kernel-dev-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.tar.gz
ARM: Merge for-2635-4/watchdog
Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 11d2353..44a9def 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -93,6 +93,8 @@ config MACH_SMDK6410
select SAMSUNG_DEV_TS
select S3C_DEV_USB_HOST
select S3C_DEV_USB_HSOTG
+ select S3C_DEV_WDT
+ select HAVE_S3C2410_WATCHDOG
select S3C64XX_SETUP_SDHCI
select S3C64XX_SETUP_I2C1
select S3C64XX_SETUP_FB_24BPP
OpenPOWER on IntegriCloud