diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 15:43:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 15:43:28 -0400 |
| commit | 4b478cedcdc1b2d131170f22bd3f916e53472f52 (patch) | |
| tree | 4a458a850d99fe3e2768fc62b2e3761c85ea05c2 /arch/arm/mach-s3c2412 | |
| parent | ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21 (diff) | |
| parent | c8b7d43b6d539218c36f0ac8a6ad434b93195703 (diff) | |
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
ARM: mach-loki: delete
ARM: mach-s3c2400: delete
ARM: mach-s3c24a0: delete
Diffstat (limited to 'arch/arm/mach-s3c2412')
| -rw-r--r-- | arch/arm/mach-s3c2412/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index e82ab4aa7ab9..c2cf4e569989 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -15,7 +15,7 @@ config CPU_S3C2412 | |||
| 15 | 15 | ||
| 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_S3C2410 && \ |
| 19 | !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ | 19 | !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ |
| 20 | !CPU_S3C2443 && CPU_S3C2412 | 20 | !CPU_S3C2443 && CPU_S3C2412 |
| 21 | default y if CPU_S3C2412 | 21 | default y if CPU_S3C2412 |