commit d8653d9f657d052dca18407c59349981ac579469
author Banajit Goswami <banajit.g@samsung.com> Thu Jul 29 22:22:40 2010 +0900
committer Kukjin Kim <kgene.kim@samsung.com> Fri Aug 06 21:26:56 2010 +0900
tree 5286b7712923414edf1247e3ffa84915fa812322
parent 88eb715673804949b0086a5b182d52cca4fd4d43

ARM: SAMSUNG: Make WDT driver dependency SoC specific instead of machine specific

This patch moves the dependency of watchdog timer driver from MACH_XXX(board)
to ARCH_XXX(SoC). This will enable all machines using Samsung S3C64XX and S5P
SoCs to use the WDT driver by default.

Signed-off-by: Banajit Goswami <banajit.g@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Conflicts:

	arch/arm/Kconfig
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig

arch/arm/mach-s5p6442/Kconfig

diff --git a/arch/arm/mach-s5p6442/Kconfig b/arch/arm/mach-s5p6442/Kconfig
index 0fd41b4..0fda0a5 100644
--- a/arch/arm/mach-s5p6442/Kconfig
+++ b/arch/arm/mach-s5p6442/Kconfig
@@ -19,6 +19,7 @@
 config MACH_SMDK6442
 	bool "SMDK6442"
 	select CPU_S5P6442
+	select S3C_DEV_WDT
 	help
 	  Machine support for Samsung SMDK6442