diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-25 20:11:04 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-25 20:16:32 -0500 |
| commit | 431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch) | |
| tree | 6515a616e8ed60480e169188e630936794be2c77 /arch/arm/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/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bbcd512ccf7e..ecf963d61aed 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -160,7 +160,7 @@ machine-$(CONFIG_ARCH_REALVIEW) := realview | |||
| 160 | machine-$(CONFIG_ARCH_RPC) := rpc | 160 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
| 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |
| 165 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | 165 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 |
| 166 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 166 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |