diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 04:13:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 04:13:50 +0300 |
| commit | 2cedcc4f122934c3ad38dfb2a400b98a62703e6d (patch) | |
| tree | dffa5daaf84cc7cd1a7e966ce4c6885e4dd974b9 /arch/arm/mach-s3c2412/Kconfig | |
| parent | 6142e05f30b101adeafb0d12e35983f44f68233e (diff) | |
| parent | 812c4e40c27b6ea103ecfbf91d43654356629b81 (diff) | |
| download | linux-2cedcc4f122934c3ad38dfb2a400b98a62703e6d.tar.xz | |
Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
* 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
ARM: mini2440: Fix Kconfig to allow kernel to build
ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
ARM: S3C2443: Select properly ARM core type
ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
Diffstat (limited to 'arch/arm/mach-s3c2412/Kconfig')
| -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 cef6a65637bd..fa2e5bffbb8e 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig @@ -16,7 +16,7 @@ config CPU_S3C2412 config CPU_S3C2412_ONLY bool depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \ - !CPU_2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ + !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \ !CPU_S3C2443 && CPU_S3C2412 default y if CPU_S3C2412 |