summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Kconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 18:55:32 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 18:55:32 +0900
commitea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch)
treea7f2cdb121fc44cfd7c382207104f867f93736c9 /arch/arm/plat-samsung/Kconfig
parentfac3d3555568de1755025a9609daf492dd548a59 (diff)
parenteff4c74da7944ba30feb47b51d1e9e940e6682ff (diff)
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1 Conflicts: arch/arm/mach-s5pv210/include/mach/map.h
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
-rw-r--r--arch/arm/plat-samsung/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 1077ebebfb0..b787d576d4b 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -170,6 +170,11 @@ config S3C_DEV_I2C1
help
Compile in platform device definitions for I2C channel 1
+config S3C_DEV_I2C2
+ bool
+ help
+ Compile in platform device definitions for I2C channel 2
+
config S3C_DEV_FB
bool
help