diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 16:14:35 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 16:14:35 -0800 |
| commit | 7dcbeef7926fefa53b0466a27c90238744fb11d8 (patch) | |
| tree | 86d7406fb86068b6f5177fa8d9446ffe7403841a /arch/arm/Kconfig | |
| parent | f0390669d13b0a1592fc7906445b4f6c8ec5af23 (diff) | |
| parent | acf2d41d8595829eb0ac7bf6891f4875a78d4d6e (diff) | |
Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
Basically, this patch merges mach-s3c2410, mach-s3c2412 and mach-s3c2440
into mach-s3c24xx.
* 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/
ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/
ARM: S3C24XX: Move mach-s3c2412/ cpufreq driver into mach-s3c24xx/
ARM: S3C2412: Remove useless codes mach-s3c2412/gpio.c
ARM: S3C24XX: Move mach-s3c2410/ pll into mach-s3c24xx/
ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c2950f3e678..17f49ccb832 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1086,10 +1086,6 @@ source "arch/arm/mach-socfpga/Kconfig" source "arch/arm/plat-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" -if ARCH_S3C24XX -source "arch/arm/mach-s3c2412/Kconfig" -source "arch/arm/mach-s3c2440/Kconfig" -endif if ARCH_S3C64XX source "arch/arm/mach-s3c64xx/Kconfig" |