diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:55:32 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:55:32 -0400 |
| commit | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch) | |
| tree | a7f2cdb121fc44cfd7c382207104f867f93736c9 /arch/arm/plat-samsung/Kconfig | |
| parent | fac3d3555568de1755025a9609daf492dd548a59 (diff) | |
| parent | eff4c74da7944ba30feb47b51d1e9e940e6682ff (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/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 1077ebebfb03..b787d576d4b3 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
| @@ -170,6 +170,11 @@ config S3C_DEV_I2C1 | |||
| 170 | help | 170 | help |
| 171 | Compile in platform device definitions for I2C channel 1 | 171 | Compile in platform device definitions for I2C channel 1 |
| 172 | 172 | ||
| 173 | config S3C_DEV_I2C2 | ||
| 174 | bool | ||
| 175 | help | ||
| 176 | Compile in platform device definitions for I2C channel 2 | ||
| 177 | |||
| 173 | config S3C_DEV_FB | 178 | config S3C_DEV_FB |
| 174 | bool | 179 | bool |
| 175 | help | 180 | help |