Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c39d8d55 authored by Kyungmin Park's avatar Kyungmin Park Committed by Kukjin Kim
Browse files

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: default avatarKyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: Added fix same warning(mach-s3c64xx/Kconfig)]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c8ddb271

arch/arm/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ config ARCH_S3C64XX 
	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S3C64XX series based systems
@@ -686,7 +686,7 @@ config ARCH_S5P64X0 
	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC
@@ -700,7 +700,7 @@ config ARCH_S5P6442 
	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5P6442 CPU based systems
@@ -713,7 +713,7 @@ config ARCH_S5PC100 
	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5PC100 series based systems
@@ -728,7 +728,7 @@ config ARCH_S5PV210 
	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5PV210/S5PC110 series based systems
@@ -741,7 +741,7 @@ config ARCH_S5PV310 
	select GENERIC_CLOCKEVENTS

	select HAVE_S3C_RTC

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5PV310 series based systems

arch/arm/mach-s3c64xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ config MACH_SMDK6410 
	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select SAMSUNG_DEV_KEYPAD

	select HAVE_S3C2410_WATCHDOG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_I2C1

	select S3C64XX_SETUP_IDE