diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 17:01:56 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 17:01:56 -0800 |
| commit | cf55f672c325f234d96911571a775b2e7d9cf284 (patch) | |
| tree | 9242f9ddb0f556dca7884c60ad81aefbe35ae258 /arch/arm/Kconfig | |
| parent | 5060c8881a4b177e27d5bcf351212f2bee125955 (diff) | |
| parent | 37c3adca81b282bdf310d5ed54acbc28ac0b20a3 (diff) | |
Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
This is 4th cleanup for Samsung S3C24XX stuff, and removes plat-s3c24xx
directory.
* 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: header mach/regs-mem.h local
ARM: S3C24XX: header mach/regs-power.h local
ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 17f49ccb832..42e263a8d35 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1079,7 +1079,6 @@ source "arch/arm/mach-realview/Kconfig" source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/plat-samsung/Kconfig" -source "arch/arm/plat-s3c24xx/Kconfig" source "arch/arm/mach-socfpga/Kconfig" |