diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 04:11:04 +0300 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 04:16:32 +0300 |
| commit | 431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch) | |
| tree | 6515a616e8ed60480e169188e630936794be2c77 /arch/arm/Kconfig | |
| parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) | |
| download | linux-431107ea5b680a24a4d01fbd3a178a3eb932f378.tar.xz | |
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
As per discussions with Russell King on linux-arm-kernel, it appears that
both mach-s3c6400 and mach-s3c6410 are so close together that they should
simply be merged into mach-s3c64xx.
Note, this patch does not eliminate any of the bits that are still common,
it is simply a move of the two directories together, any further common
code will be eliminated or moved in further patches.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3bc5169f0f82..685ff7effff9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -799,8 +799,7 @@ source "arch/arm/mach-s3c2443/Kconfig" endif if ARCH_S3C64XX -source "arch/arm/mach-s3c6400/Kconfig" -source "arch/arm/mach-s3c6410/Kconfig" +source "arch/arm/mach-s3c64xx/Kconfig" endif source "arch/arm/mach-s5p6440/Kconfig" |