431107ea5b680a24a4d01fbd3a178a3eb932f378 - linux

commit	431107ea5b680a24a4d01fbd3a178a3eb932f378	[log] [tgz]
author	Ben Dooks <ben-linux@fluff.org>	Tue Jan 26 10:11:04 2010 +0900
committer	Ben Dooks <ben-linux@fluff.org>	Tue Jan 26 10:16:32 2010 +0900
tree	6515a616e8ed60480e169188e630936794be2c77
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>

arch/arm/Kconfig[diff]
arch/arm/Makefile[diff]
arch/arm/mach-s3c6400/Kconfig[Deleted - diff]
arch/arm/mach-s3c6400/Makefile[Deleted - diff]
arch/arm/mach-s3c6410/Makefile[Deleted - diff]
arch/arm/mach-s3c64xx/Kconfig[Renamed from arch/arm/mach-s3c6410/Kconfig - diff]
arch/arm/mach-s3c64xx/Makefile[Added - diff]
arch/arm/mach-s3c64xx/Makefile.boot[Renamed from arch/arm/mach-s3c6400/Makefile.boot - diff]
arch/arm/mach-s3c64xx/include/mach/debug-macro.S[Renamed from arch/arm/mach-s3c6400/include/mach/debug-macro.S - diff]
arch/arm/mach-s3c64xx/include/mach/dma.h[Renamed from arch/arm/mach-s3c6400/include/mach/dma.h - diff]
arch/arm/mach-s3c64xx/include/mach/entry-macro.S[Renamed from arch/arm/mach-s3c6400/include/mach/entry-macro.S - diff]
arch/arm/mach-s3c64xx/include/mach/gpio.h[Renamed from arch/arm/mach-s3c6400/include/mach/gpio.h - diff]
arch/arm/mach-s3c64xx/include/mach/hardware.h[Renamed from arch/arm/mach-s3c6400/include/mach/hardware.h - diff]
arch/arm/mach-s3c64xx/include/mach/irqs.h[Renamed from arch/arm/mach-s3c6400/include/mach/irqs.h - diff]
arch/arm/mach-s3c64xx/include/mach/map.h[Renamed from arch/arm/mach-s3c6400/include/mach/map.h - diff]
arch/arm/mach-s3c64xx/include/mach/memory.h[Renamed from arch/arm/mach-s3c6400/include/mach/memory.h - diff]
arch/arm/mach-s3c64xx/include/mach/pwm-clock.h[Renamed from arch/arm/mach-s3c6400/include/mach/pwm-clock.h - diff]
arch/arm/mach-s3c64xx/include/mach/regs-clock.h[Renamed from arch/arm/mach-s3c6400/include/mach/regs-clock.h - diff]
arch/arm/mach-s3c64xx/include/mach/regs-fb.h[Renamed from arch/arm/mach-s3c6400/include/mach/regs-fb.h - diff]
arch/arm/mach-s3c64xx/include/mach/regs-irq.h[Renamed from arch/arm/mach-s3c6400/include/mach/regs-irq.h - diff]
arch/arm/mach-s3c64xx/include/mach/system.h[Renamed from arch/arm/mach-s3c6400/include/mach/system.h - diff]
arch/arm/mach-s3c64xx/include/mach/tick.h[Renamed from arch/arm/mach-s3c6400/include/mach/tick.h - diff]
arch/arm/mach-s3c64xx/include/mach/uncompress.h[Renamed from arch/arm/mach-s3c6400/include/mach/uncompress.h - diff]
arch/arm/mach-s3c64xx/mach-anw6410.c[Renamed from arch/arm/mach-s3c6410/mach-anw6410.c - diff]
arch/arm/mach-s3c64xx/mach-hmt.c[Renamed from arch/arm/mach-s3c6410/mach-hmt.c - diff]
arch/arm/mach-s3c64xx/mach-ncp.c[Renamed from arch/arm/mach-s3c6410/mach-ncp.c - diff]
arch/arm/mach-s3c64xx/mach-smdk6400.c[Renamed from arch/arm/mach-s3c6400/mach-smdk6400.c - diff]
arch/arm/mach-s3c64xx/mach-smdk6410.c[Renamed from arch/arm/mach-s3c6410/mach-smdk6410.c - diff]
arch/arm/mach-s3c64xx/s3c6400.c[Renamed from arch/arm/mach-s3c6400/s3c6400.c - diff]
arch/arm/mach-s3c64xx/s3c6410.c[Renamed from arch/arm/mach-s3c6410/cpu.c - diff]
arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c[Renamed from arch/arm/mach-s3c6400/setup-sdhci.c - diff]
arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c[Renamed from arch/arm/mach-s3c6410/setup-sdhci.c - diff]

32 files changed

tree: 6515a616e8ed60480e169188e630936794be2c77