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/Kconfig | |
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/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bc9506cdf4d1..3b5add123396 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -665,6 +665,7 @@ config ARCH_S3C64XX | |||
665 | select USB_ARCH_HAS_OHCI | 665 | select USB_ARCH_HAS_OHCI |
666 | select SAMSUNG_GPIOLIB_4BIT | 666 | select SAMSUNG_GPIOLIB_4BIT |
667 | select HAVE_S3C2410_I2C | 667 | select HAVE_S3C2410_I2C |
668 | select HAVE_S3C2410_WATCHDOG | ||
668 | help | 669 | help |
669 | Samsung S3C64XX series based systems | 670 | Samsung S3C64XX series based systems |
670 | 671 | ||
@@ -673,6 +674,7 @@ config ARCH_S5P6440 | |||
673 | select CPU_V6 | 674 | select CPU_V6 |
674 | select GENERIC_GPIO | 675 | select GENERIC_GPIO |
675 | select HAVE_CLK | 676 | select HAVE_CLK |
677 | select HAVE_S3C2410_WATCHDOG | ||
676 | select ARCH_USES_GETTIMEOFFSET | 678 | select ARCH_USES_GETTIMEOFFSET |
677 | select HAVE_S3C2410_I2C | 679 | select HAVE_S3C2410_I2C |
678 | select HAVE_S3C_RTC | 680 | select HAVE_S3C_RTC |
@@ -685,6 +687,7 @@ config ARCH_S5P6442 | |||
685 | select GENERIC_GPIO | 687 | select GENERIC_GPIO |
686 | select HAVE_CLK | 688 | select HAVE_CLK |
687 | select ARCH_USES_GETTIMEOFFSET | 689 | select ARCH_USES_GETTIMEOFFSET |
690 | select HAVE_S3C2410_WATCHDOG | ||
688 | help | 691 | help |
689 | Samsung S5P6442 CPU based systems | 692 | Samsung S5P6442 CPU based systems |
690 | 693 | ||
@@ -697,6 +700,7 @@ config ARCH_S5PC100 | |||
697 | select ARCH_USES_GETTIMEOFFSET | 700 | select ARCH_USES_GETTIMEOFFSET |
698 | select HAVE_S3C2410_I2C | 701 | select HAVE_S3C2410_I2C |
699 | select HAVE_S3C_RTC | 702 | select HAVE_S3C_RTC |
703 | select HAVE_S3C2410_WATCHDOG | ||
700 | help | 704 | help |
701 | Samsung S5PC100 series based systems | 705 | Samsung S5PC100 series based systems |
702 | 706 | ||
@@ -709,6 +713,7 @@ config ARCH_S5PV210 | |||
709 | select ARCH_USES_GETTIMEOFFSET | 713 | select ARCH_USES_GETTIMEOFFSET |
710 | select HAVE_S3C2410_I2C | 714 | select HAVE_S3C2410_I2C |
711 | select HAVE_S3C_RTC | 715 | select HAVE_S3C_RTC |
716 | select HAVE_S3C2410_WATCHDOG | ||
712 | help | 717 | help |
713 | Samsung S5PV210/S5PC110 series based systems | 718 | Samsung S5PV210/S5PC110 series based systems |
714 | 719 | ||