diff options
| -rw-r--r-- | arch/arm/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6440/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5pc100/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 2 |
5 files changed, 7 insertions, 3 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 | ||
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig index f066fae07c57..084c0bced13c 100644 --- a/arch/arm/mach-s5p6440/Kconfig +++ b/arch/arm/mach-s5p6440/Kconfig | |||
| @@ -19,7 +19,6 @@ config MACH_SMDK6440 | |||
| 19 | select SAMSUNG_DEV_TS | 19 | select SAMSUNG_DEV_TS |
| 20 | select SAMSUNG_DEV_ADC | 20 | select SAMSUNG_DEV_ADC |
| 21 | select S3C_DEV_WDT | 21 | select S3C_DEV_WDT |
| 22 | select HAVE_S3C2410_WATCHDOG | ||
| 23 | help | 22 | help |
| 24 | Machine support for the Samsung SMDK6440 | 23 | Machine support for the Samsung SMDK6440 |
| 25 | 24 | ||
diff --git a/arch/arm/mach-s5p6442/Kconfig b/arch/arm/mach-s5p6442/Kconfig index 0fd41b447915..0fda0a5df968 100644 --- a/arch/arm/mach-s5p6442/Kconfig +++ b/arch/arm/mach-s5p6442/Kconfig | |||
| @@ -19,6 +19,7 @@ config CPU_S5P6442 | |||
| 19 | config MACH_SMDK6442 | 19 | config MACH_SMDK6442 |
| 20 | bool "SMDK6442" | 20 | bool "SMDK6442" |
| 21 | select CPU_S5P6442 | 21 | select CPU_S5P6442 |
| 22 | select S3C_DEV_WDT | ||
| 22 | help | 23 | help |
| 23 | Machine support for Samsung SMDK6442 | 24 | Machine support for Samsung SMDK6442 |
| 24 | 25 | ||
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig index b2a11dfa3399..0593b3fb0d4b 100644 --- a/arch/arm/mach-s5pc100/Kconfig +++ b/arch/arm/mach-s5pc100/Kconfig | |||
| @@ -44,6 +44,7 @@ config MACH_SMDKC100 | |||
| 44 | select S3C_DEV_HSMMC | 44 | select S3C_DEV_HSMMC |
| 45 | select S3C_DEV_HSMMC1 | 45 | select S3C_DEV_HSMMC1 |
| 46 | select S3C_DEV_HSMMC2 | 46 | select S3C_DEV_HSMMC2 |
| 47 | select S3C_DEV_WDT | ||
| 47 | select S5PC100_SETUP_FB_24BPP | 48 | select S5PC100_SETUP_FB_24BPP |
| 48 | select S5PC100_SETUP_I2C1 | 49 | select S5PC100_SETUP_I2C1 |
| 49 | select S5PC100_SETUP_SDHCI | 50 | select S5PC100_SETUP_SDHCI |
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 |