2 files changed, 14 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ea668a41b991..bc9506cdf4d1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -634,6 +634,7 @@ config ARCH_S3C2410
         select ARCH_HAS_CPUFREQ
         select HAVE_CLK
         select ARCH_USES_GETTIMEOFFSET
+        select HAVE_S3C2410_I2C
         help
           Samsung S3C2410X CPU based systems, such as the Simtec Electronics
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -663,6 +664,7 @@ config ARCH_S3C64XX
         select S3C_DEV_NAND
         select USB_ARCH_HAS_OHCI
         select SAMSUNG_GPIOLIB_4BIT
+        select HAVE_S3C2410_I2C
         help
           Samsung S3C64XX series based systems
 
@@ -672,6 +674,7 @@ config ARCH_S5P6440
         select GENERIC_GPIO
         select HAVE_CLK
         select ARCH_USES_GETTIMEOFFSET
+        select HAVE_S3C2410_I2C
         select HAVE_S3C_RTC
         help
           Samsung S5P6440 CPU based systems
@@ -692,6 +695,7 @@ config ARCH_S5PC100
         select CPU_V7
         select ARM_L1_CACHE_SHIFT_6
         select ARCH_USES_GETTIMEOFFSET
+        select HAVE_S3C2410_I2C
         select HAVE_S3C_RTC
         help
           Samsung S5PC100 series based systems
@@ -703,6 +707,7 @@ config ARCH_S5PV210
         select HAVE_CLK
         select ARM_L1_CACHE_SHIFT_6
         select ARCH_USES_GETTIMEOFFSET
+        select HAVE_S3C2410_I2C
         select HAVE_S3C_RTC
         help
           Samsung S5PV210/S5PC110 series based systems
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index bceafbfa7268..80143899ccec 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -521,12 +521,19 @@ config I2C_PXA_SLAVE
           is necessary for systems where the PXA may be a target on the
           I2C bus.
 
+config HAVE_S3C2410_I2C
+        bool
+        help
+          This will include I2C support for Samsung SoCs. If you want to
+          include I2C support for any machine, kindly select this in the
+          respective Kconfig file.
+
 config I2C_S3C2410
         tristate "S3C2410 I2C Driver"
-        depends on ARCH_S3C2410 || ARCH_S3C64XX
+        depends on HAVE_S3C2410_I2C
         help
           Say Y here to include support for I2C controller in the
-          Samsung S3C2410 based System-on-Chip devices.
+          Samsung SoCs.
 
 config I2C_S6000
         tristate "S6000 I2C support"