diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:11 -0400 |
| commit | 32457942b90aabb9242b450f02d18d9c8d982916 (patch) | |
| tree | 6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /arch/arm/mach-s3c2412 | |
| parent | 6071399674e813d797d9f458ec8913b86c85398e (diff) | |
| parent | f64bea4318a73e833d0a9b8400cc0f6cee957da3 (diff) | |
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2412')
| -rw-r--r-- | arch/arm/mach-s3c2412/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index 9a8c0657ae50..cef6a65637bd 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -16,7 +16,8 @@ config CPU_S3C2412 | |||
| 16 | config CPU_S3C2412_ONLY | 16 | config CPU_S3C2412_ONLY |
| 17 | bool | 17 | bool |
| 18 | depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \ | 18 | depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \ |
| 19 | !CPU_S3C2440 && !CPU_S3C2442 && !CPU_S3C2443 && CPU_S3C2412 | 19 | !CPU_2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ |
| 20 | !CPU_S3C2443 && CPU_S3C2412 | ||
| 20 | default y if CPU_S3C2412 | 21 | default y if CPU_S3C2412 |
| 21 | 22 | ||
| 22 | config S3C2412_DMA | 23 | config S3C2412_DMA |