diff options
| author | Banajit Goswami <banajit.g@samsung.com> | 2010-07-29 09:22:40 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:26:56 -0400 |
| commit | d8653d9f657d052dca18407c59349981ac579469 (patch) | |
| tree | 5286b7712923414edf1247e3ffa84915fa812322 /arch/arm/mach-s5pv210 | |
| parent | 88eb715673804949b0086a5b182d52cca4fd4d43 (diff) | |
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
Diffstat (limited to 'arch/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 0761eac9aaea..2e3ed1847ca6 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
| @@ -74,7 +74,6 @@ config MACH_SMDKV210 | |||
| 74 | select SAMSUNG_DEV_ADC | 74 | select SAMSUNG_DEV_ADC |
| 75 | select SAMSUNG_DEV_TS | 75 | select SAMSUNG_DEV_TS |
| 76 | select S3C_DEV_WDT | 76 | select S3C_DEV_WDT |
| 77 | select HAVE_S3C2410_WATCHDOG | ||
| 78 | help | 77 | help |
| 79 | Machine support for Samsung SMDKV210 | 78 | Machine support for Samsung SMDKV210 |
| 80 | 79 | ||
| @@ -83,7 +82,6 @@ config MACH_SMDKC110 | |||
| 83 | select CPU_S5PV210 | 82 | select CPU_S5PV210 |
| 84 | select ARCH_SPARSEMEM_ENABLE | 83 | select ARCH_SPARSEMEM_ENABLE |
| 85 | select S3C_DEV_WDT | 84 | select S3C_DEV_WDT |
| 86 | select HAVE_S3C2410_WATCHDOG | ||
| 87 | help | 85 | help |
| 88 | Machine support for Samsung SMDKC110 | 86 | Machine support for Samsung SMDKC110 |
| 89 | S5PC110(MCP) is one of package option of S5PV210 | 87 | S5PC110(MCP) is one of package option of S5PV210 |