2 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8ae3d48d504c..db524e75c4a2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG
+        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_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC
+        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_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC
+        select HAVE_S3C_RTC if RTC_CLASS
-        select HAVE_S3C2410_WATCHDOG
+        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_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC
+        select HAVE_S3C_RTC if RTC_CLASS
-        select HAVE_S3C2410_WATCHDOG
+        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_S3C_RTC if RTC_CLASS
-        select HAVE_S3C2410_I2C
+        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        help
          Samsung S5PV310 series based systems
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
        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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8ae3d48d504c..db524e75c4a2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -646,7 +646,7 @@ config ARCH_S3C2410
646	select ARCH_HAS_CPUFREQ	646	select ARCH_HAS_CPUFREQ
647	select HAVE_CLK	647	select HAVE_CLK
648	select ARCH_USES_GETTIMEOFFSET	648	select ARCH_USES_GETTIMEOFFSET
649	select HAVE_S3C2410_I2C	649	select HAVE_S3C2410_I2C if I2C
650	help	650	help
651	Samsung S3C2410X CPU based systems, such as the Simtec Electronics	651	Samsung S3C2410X CPU based systems, such as the Simtec Electronics
652	BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or	652	BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -676,8 +676,8 @@ config ARCH_S3C64XX
676	select S3C_DEV_NAND	676	select S3C_DEV_NAND
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 if 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,10 +686,10 @@ 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 if I2C
692	select HAVE_S3C_RTC	692	select HAVE_S3C_RTC if RTC_CLASS
693	help	693	help
694	Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,	694	Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
695	SMDK6450.	695	SMDK6450.
@@ -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
@@ -711,9 +711,9 @@ config ARCH_S5PC100
711	select CPU_V7	711	select CPU_V7
712	select ARM_L1_CACHE_SHIFT_6	712	select ARM_L1_CACHE_SHIFT_6
713	select ARCH_USES_GETTIMEOFFSET	713	select ARCH_USES_GETTIMEOFFSET
714	select HAVE_S3C2410_I2C	714	select HAVE_S3C2410_I2C if I2C
715	select HAVE_S3C_RTC	715	select HAVE_S3C_RTC if RTC_CLASS
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
@@ -726,9 +726,9 @@ config ARCH_S5PV210
726	select ARM_L1_CACHE_SHIFT_6	726	select ARM_L1_CACHE_SHIFT_6
727	select ARCH_HAS_CPUFREQ	727	select ARCH_HAS_CPUFREQ
728	select ARCH_USES_GETTIMEOFFSET	728	select ARCH_USES_GETTIMEOFFSET
729	select HAVE_S3C2410_I2C	729	select HAVE_S3C2410_I2C if I2C
730	select HAVE_S3C_RTC	730	select HAVE_S3C_RTC if RTC_CLASS
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
@@ -739,9 +739,9 @@ config ARCH_S5PV310
739	select GENERIC_GPIO	739	select GENERIC_GPIO
740	select HAVE_CLK	740	select HAVE_CLK
741	select GENERIC_CLOCKEVENTS	741	select GENERIC_CLOCKEVENTS
742	select HAVE_S3C_RTC	742	select HAVE_S3C_RTC if RTC_CLASS
743	select HAVE_S3C2410_I2C	743	select HAVE_S3C2410_I2C if 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