diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s5p6440/Kconfig | |
| parent | ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,parti... (diff) | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| download | linux-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.xz linux-0b019a41553a919965bb02d07d54e3e6c57a796d.zip | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5p6440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5p6440/Kconfig | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig index f066fae07c57..6a4af7f57584 100644 --- a/arch/arm/mach-s5p6440/Kconfig +++ b/arch/arm/mach-s5p6440/Kconfig @@ -13,13 +13,20 @@ config CPU_S5P6440 help Enable S5P6440 CPU support +config S5P6440_SETUP_I2C1 + bool + help + Common setup code for i2c bus 1. + config MACH_SMDK6440 bool "SMDK6440" select CPU_S5P6440 - select SAMSUNG_DEV_TS - select SAMSUNG_DEV_ADC + select S3C_DEV_I2C1 + select S3C_DEV_RTC select S3C_DEV_WDT - select HAVE_S3C2410_WATCHDOG + select SAMSUNG_DEV_ADC + select SAMSUNG_DEV_TS + select S5P6440_SETUP_I2C1 help Machine support for the Samsung SMDK6440 |