diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
| commit | 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 (patch) | |
| tree | 27b967178723f0230043dc0b0d1436d2eb81a29d /arch/arm/mach-s3c2443/Kconfig | |
| parent | ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 (diff) | |
| parent | 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 (diff) | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c2443/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2443/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/Kconfig b/arch/arm/mach-s3c2443/Kconfig index 31babec90cec..d8eb86823df7 100644 --- a/arch/arm/mach-s3c2443/Kconfig +++ b/arch/arm/mach-s3c2443/Kconfig | |||
| @@ -10,6 +10,7 @@ config CPU_S3C2443 | |||
| 10 | select CPU_LLSERIAL_S3C2440 | 10 | select CPU_LLSERIAL_S3C2440 |
| 11 | select SAMSUNG_CLKSRC | 11 | select SAMSUNG_CLKSRC |
| 12 | select S3C2443_CLOCK | 12 | select S3C2443_CLOCK |
| 13 | select S3C_GPIO_PULL_S3C2443 | ||
| 13 | help | 14 | help |
| 14 | Support for the S3C2443 SoC from the S3C24XX line | 15 | Support for the S3C2443 SoC from the S3C24XX line |
| 15 | 16 | ||
| @@ -25,7 +26,7 @@ config MACH_SMDK2443 | |||
| 25 | bool "SMDK2443" | 26 | bool "SMDK2443" |
| 26 | select CPU_S3C2443 | 27 | select CPU_S3C2443 |
| 27 | select MACH_SMDK | 28 | select MACH_SMDK |
| 28 | select S3C_DEV_HSMMC | 29 | select S3C_DEV_HSMMC1 |
| 29 | help | 30 | help |
| 30 | Say Y here if you are using an SMDK2443 | 31 | Say Y here if you are using an SMDK2443 |
| 31 | 32 | ||