summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
commit2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch)
tree15ab3c23d05e98829741b03922b51b81fd102b64 /drivers/i2c
parent500b9fc922cbec572f4fd1436533bfaed5011262 (diff)
parenta68fefe0d2f364ac3d8497ef37dcad713c261103 (diff)
downloadlinux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.gz
linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.bz2
linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 29e01f6238a7..15a9702e2941 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"