ARM: S3C64XX: Merge s3c6400-init.c into cpu.c
authorBen Dooks <ben-linux@fluff.org>
Tue, 26 Jan 2010 05:32:09 +0000 (14:32 +0900)
committerBen Dooks <ben-linux@fluff.org>
Sat, 20 Feb 2010 22:34:01 +0000 (22:34 +0000)
Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/cpu.c
arch/arm/plat-s3c64xx/Kconfig
arch/arm/plat-s3c64xx/Makefile
arch/arm/plat-s3c64xx/s3c6400-init.c [deleted file]

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc arch/arm/plat-s3c64xx/s3c6400-init.c
Simple merge