diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-11-13 02:01:59 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-11-13 02:30:29 -0500 |
| commit | c39d8d558dd79ce3444bfd590f5d8f0b8ad85879 (patch) | |
| tree | b72d5d7134d9614d6194a37a7365d9d91132367a | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
Fix build warnings
warning: (ARCH_S3C64XX && <choice> && WATCHDOG || ARCH_S5P64X0 && <choice> && WATCHDOG ||
ARCH_S5P6442 && <choice> && WATCHDOG || ARCH_S5PC100 && <choice> ||
ARCH_S5PV210 && <choice> || ARCH_S5PV310 && <choice> || MACH_SMDK6410 && ARCH_S3C64XX)
selects HAVE_S3C2410_WATCHDOG which has unmet direct dependencies (WATCHDOG)
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: Added fix same warning(mach-s3c64xx/Kconfig)]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a19a5266d5fc..a30271385e70 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -677,7 +677,7 @@ config ARCH_S3C64XX | |||
| 677 | select USB_ARCH_HAS_OHCI | 677 | select USB_ARCH_HAS_OHCI |
| 678 | select SAMSUNG_GPIOLIB_4BIT | 678 | select SAMSUNG_GPIOLIB_4BIT |
| 679 | select HAVE_S3C2410_I2C | 679 | select HAVE_S3C2410_I2C |
| 680 | select HAVE_S3C2410_WATCHDOG | 680 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 681 | help | 681 | help |
| 682 | Samsung S3C64XX series based systems | 682 | Samsung S3C64XX series based systems |
| 683 | 683 | ||
| @@ -686,7 +686,7 @@ config ARCH_S5P64X0 | |||
| 686 | select CPU_V6 | 686 | select CPU_V6 |
| 687 | select GENERIC_GPIO | 687 | select GENERIC_GPIO |
| 688 | select HAVE_CLK | 688 | select HAVE_CLK |
| 689 | select HAVE_S3C2410_WATCHDOG | 689 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 690 | select ARCH_USES_GETTIMEOFFSET | 690 | select ARCH_USES_GETTIMEOFFSET |
| 691 | select HAVE_S3C2410_I2C | 691 | select HAVE_S3C2410_I2C |
| 692 | select HAVE_S3C_RTC | 692 | select HAVE_S3C_RTC |
| @@ -700,7 +700,7 @@ config ARCH_S5P6442 | |||
| 700 | select GENERIC_GPIO | 700 | select GENERIC_GPIO |
| 701 | select HAVE_CLK | 701 | select HAVE_CLK |
| 702 | select ARCH_USES_GETTIMEOFFSET | 702 | select ARCH_USES_GETTIMEOFFSET |
| 703 | select HAVE_S3C2410_WATCHDOG | 703 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 704 | help | 704 | help |
| 705 | Samsung S5P6442 CPU based systems | 705 | Samsung S5P6442 CPU based systems |
| 706 | 706 | ||
| @@ -713,7 +713,7 @@ config ARCH_S5PC100 | |||
| 713 | select ARCH_USES_GETTIMEOFFSET | 713 | select ARCH_USES_GETTIMEOFFSET |
| 714 | select HAVE_S3C2410_I2C | 714 | select HAVE_S3C2410_I2C |
| 715 | select HAVE_S3C_RTC | 715 | select HAVE_S3C_RTC |
| 716 | select HAVE_S3C2410_WATCHDOG | 716 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 717 | help | 717 | help |
| 718 | Samsung S5PC100 series based systems | 718 | Samsung S5PC100 series based systems |
| 719 | 719 | ||
| @@ -728,7 +728,7 @@ config ARCH_S5PV210 | |||
| 728 | select ARCH_USES_GETTIMEOFFSET | 728 | select ARCH_USES_GETTIMEOFFSET |
| 729 | select HAVE_S3C2410_I2C | 729 | select HAVE_S3C2410_I2C |
| 730 | select HAVE_S3C_RTC | 730 | select HAVE_S3C_RTC |
| 731 | select HAVE_S3C2410_WATCHDOG | 731 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 732 | help | 732 | help |
| 733 | Samsung S5PV210/S5PC110 series based systems | 733 | Samsung S5PV210/S5PC110 series based systems |
| 734 | 734 | ||
| @@ -741,7 +741,7 @@ config ARCH_S5PV310 | |||
| 741 | select GENERIC_CLOCKEVENTS | 741 | select GENERIC_CLOCKEVENTS |
| 742 | select HAVE_S3C_RTC | 742 | select HAVE_S3C_RTC |
| 743 | select HAVE_S3C2410_I2C | 743 | select HAVE_S3C2410_I2C |
| 744 | select HAVE_S3C2410_WATCHDOG | 744 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 745 | help | 745 | help |
| 746 | Samsung S5PV310 series based systems | 746 | Samsung S5PV310 series based systems |
| 747 | 747 | ||
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 1ca7bdc6485c..579d2f0f4dd0 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
| @@ -143,7 +143,7 @@ config MACH_SMDK6410 | |||
| 143 | select S3C_DEV_USB_HSOTG | 143 | select S3C_DEV_USB_HSOTG |
| 144 | select S3C_DEV_WDT | 144 | select S3C_DEV_WDT |
| 145 | select SAMSUNG_DEV_KEYPAD | 145 | select SAMSUNG_DEV_KEYPAD |
| 146 | select HAVE_S3C2410_WATCHDOG | 146 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 147 | select S3C64XX_SETUP_SDHCI | 147 | select S3C64XX_SETUP_SDHCI |
| 148 | select S3C64XX_SETUP_I2C1 | 148 | select S3C64XX_SETUP_I2C1 |
| 149 | select S3C64XX_SETUP_IDE | 149 | select S3C64XX_SETUP_IDE |