diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 10:11:04 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-26 10:16:32 +0900 |
commit | 431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch) | |
tree | 6515a616e8ed60480e169188e630936794be2c77 /arch/arm/mach-s3c6400/Makefile | |
parent | ab5d97db1c6ced3e95c00d097931471707032b1f (diff) |
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/mach-s3c6400/Makefile')
-rw-r--r-- | arch/arm/mach-s3c6400/Makefile | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-s3c6400/Makefile b/arch/arm/mach-s3c6400/Makefile deleted file mode 100644 index df1ce4aa03e..00000000000 --- a/arch/arm/mach-s3c6400/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# arch/arm/mach-s3c6400/Makefile -# -# Copyright 2008 Openmoko, Inc. -# Copyright 2008 Simtec Electronics -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := -obj- := - -# Core support for S3C6400 system - -obj-$(CONFIG_CPU_S3C6400) += s3c6400.o - -# setup support - -obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci.o - -# Machine support - -obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o |