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

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Fix HAVE_S3C_RTC warnings
  ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings
  ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
Linus Torvalds 14 years ago
parent
7023166959 754961a8e1
commit
f187a4514f
2 changed files with 17 additions and 17 deletions
Split View Show Diff Stats
  1. 16 16
      arch/arm/Kconfig
  2. 1 1
      arch/arm/mach-s3c64xx/Kconfig

+ 16 - 16
arch/arm/Kconfig
View File 

@@ -646,7 +646,7 @@ config ARCH_S3C2410
 
 	select ARCH_HAS_CPUFREQ
 
 	select HAVE_CLK
 
 	select ARCH_USES_GETTIMEOFFSET
 
-	select HAVE_S3C2410_I2C
 
+	select HAVE_S3C2410_I2C if I2C
 
 	help
 
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
 
@@ -676,8 +676,8 @@ config ARCH_S3C64XX
 
 	select S3C_DEV_NAND
 
 	select USB_ARCH_HAS_OHCI
 
 	select SAMSUNG_GPIOLIB_4BIT
 
-	select HAVE_S3C2410_I2C
 
-	select HAVE_S3C2410_WATCHDOG
 
+	select HAVE_S3C2410_I2C if I2C
 
+	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 
 	help
 
 	  Samsung S3C64XX series based systems
 
 
@@ -686,10 +686,10 @@ 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
 
+	select HAVE_S3C2410_I2C if I2C
 
+	select HAVE_S3C_RTC if RTC_CLASS
 
 	help
 
 	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
 
 	  SMDK6450.
 
@@ -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
 
 
@@ -711,9 +711,9 @@ config ARCH_S5PC100
 
 	select CPU_V7
 
 	select ARM_L1_CACHE_SHIFT_6
 
 	select ARCH_USES_GETTIMEOFFSET
 
-	select HAVE_S3C2410_I2C
 
-	select HAVE_S3C_RTC
 
-	select HAVE_S3C2410_WATCHDOG
 
+	select HAVE_S3C2410_I2C if I2C
 
+	select HAVE_S3C_RTC if RTC_CLASS
 
+	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 
 	help
 
 	  Samsung S5PC100 series based systems
 
 
@@ -726,9 +726,9 @@ config ARCH_S5PV210
 
 	select ARM_L1_CACHE_SHIFT_6
 
 	select ARCH_HAS_CPUFREQ
 
 	select ARCH_USES_GETTIMEOFFSET
 
-	select HAVE_S3C2410_I2C
 
-	select HAVE_S3C_RTC
 
-	select HAVE_S3C2410_WATCHDOG
 
+	select HAVE_S3C2410_I2C if I2C
 
+	select HAVE_S3C_RTC if RTC_CLASS
 
+	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 
 	help
 
 	  Samsung S5PV210/S5PC110 series based systems
 
 
@@ -739,9 +739,9 @@ config ARCH_S5PV310
 
 	select GENERIC_GPIO
 
 	select HAVE_CLK
 
 	select GENERIC_CLOCKEVENTS
 
-	select HAVE_S3C_RTC
 
-	select HAVE_S3C2410_I2C
 
-	select HAVE_S3C2410_WATCHDOG
 
+	select HAVE_S3C_RTC if RTC_CLASS
 
+	select HAVE_S3C2410_I2C if I2C
 
+	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