Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Kyungmin Park 14 years ago
parent
c8ddb2713c
commit
c39d8d558d
2 changed files with 7 additions and 7 deletions
Split View Show Diff Stats
  1. 6 6
      arch/arm/Kconfig
  2. 1 1
      arch/arm/mach-s3c64xx/Kconfig

+ 6 - 6
arch/arm/Kconfig
View File 

@@ -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

+ 1 - 1
arch/arm/mach-s3c64xx/Kconfig
View File 

@@ -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