diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/mach-s5p6440/Kconfig | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/mach-s5p6440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5p6440/Kconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig index 153f8c9994c8..6a4af7f57584 100644 --- a/arch/arm/mach-s5p6440/Kconfig +++ b/arch/arm/mach-s5p6440/Kconfig | |||
| @@ -21,13 +21,11 @@ config S5P6440_SETUP_I2C1 | |||
| 21 | config MACH_SMDK6440 | 21 | config MACH_SMDK6440 |
| 22 | bool "SMDK6440" | 22 | bool "SMDK6440" |
| 23 | select CPU_S5P6440 | 23 | select CPU_S5P6440 |
| 24 | select SAMSUNG_DEV_TS | ||
| 25 | select SAMSUNG_DEV_ADC | ||
| 26 | select S3C_DEV_RTC | ||
| 27 | select S3C_DEV_I2C1 | 24 | select S3C_DEV_I2C1 |
| 25 | select S3C_DEV_RTC | ||
| 28 | select S3C_DEV_WDT | 26 | select S3C_DEV_WDT |
| 29 | select HAVE_S3C_RTC | 27 | select SAMSUNG_DEV_ADC |
| 30 | select HAVE_S3C2410_WATCHDOG | 28 | select SAMSUNG_DEV_TS |
| 31 | select S5P6440_SETUP_I2C1 | 29 | select S5P6440_SETUP_I2C1 |
| 32 | help | 30 | help |
| 33 | Machine support for the Samsung SMDK6440 | 31 | Machine support for the Samsung SMDK6440 |