git.karo-electronics.de Git - linux-beck.git/commit

]> git.karo-electronics.de Git - linux-beck.git/commit

author	Ben Dooks <ben-linux@fluff.org>
	Tue, 26 Jan 2010 01:11:04 +0000 (10:11 +0900)
committer	Ben Dooks <ben-linux@fluff.org>
	Tue, 26 Jan 2010 01:16:32 +0000 (10:16 +0900)
commit	431107ea5b680a24a4d01fbd3a178a3eb932f378
tree	6515a616e8ed60480e169188e630936794be2c77	tree \| snapshot
parent	ab5d97db1c6ced3e95c00d097931471707032b1f	commit \| 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>

32 files changed:

arch/arm/Kconfig		diff \| blob \| history
arch/arm/Makefile		diff \| blob \| history
arch/arm/mach-s3c6400/Kconfig	[deleted file]	blob \| history
arch/arm/mach-s3c6400/Makefile	[deleted file]	blob \| history
arch/arm/mach-s3c6410/Makefile	[deleted file]	blob \| history
arch/arm/mach-s3c64xx/Kconfig	[moved from arch/arm/mach-s3c6410/Kconfig with 84% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/Makefile	[new file with mode: 0644]	blob
arch/arm/mach-s3c64xx/Makefile.boot	[moved from arch/arm/mach-s3c6400/Makefile.boot with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/debug-macro.S	[moved from arch/arm/mach-s3c6400/include/mach/debug-macro.S with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/dma.h	[moved from arch/arm/mach-s3c6400/include/mach/dma.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/entry-macro.S	[moved from arch/arm/mach-s3c6400/include/mach/entry-macro.S with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/gpio.h	[moved from arch/arm/mach-s3c6400/include/mach/gpio.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/hardware.h	[moved from arch/arm/mach-s3c6400/include/mach/hardware.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/irqs.h	[moved from arch/arm/mach-s3c6400/include/mach/irqs.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/map.h	[moved from arch/arm/mach-s3c6400/include/mach/map.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/memory.h	[moved from arch/arm/mach-s3c6400/include/mach/memory.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/pwm-clock.h	[moved from arch/arm/mach-s3c6400/include/mach/pwm-clock.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/regs-clock.h	[moved from arch/arm/mach-s3c6400/include/mach/regs-clock.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/regs-fb.h	[moved from arch/arm/mach-s3c6400/include/mach/regs-fb.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/regs-irq.h	[moved from arch/arm/mach-s3c6400/include/mach/regs-irq.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/system.h	[moved from arch/arm/mach-s3c6400/include/mach/system.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/tick.h	[moved from arch/arm/mach-s3c6400/include/mach/tick.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/include/mach/uncompress.h	[moved from arch/arm/mach-s3c6400/include/mach/uncompress.h with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	[moved from arch/arm/mach-s3c6410/mach-anw6410.c with 99% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	[moved from arch/arm/mach-s3c6410/mach-hmt.c with 100% similarity]	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	[moved from arch/arm/mach-s3c6410/mach-ncp.c with 98% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/mach-smdk6400.c	[moved from arch/arm/mach-s3c6400/mach-smdk6400.c with 98% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	[moved from arch/arm/mach-s3c6410/mach-smdk6410.c with 99% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/s3c6400.c	[moved from arch/arm/mach-s3c6400/s3c6400.c with 98% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/s3c6410.c	[moved from arch/arm/mach-s3c6410/cpu.c with 98% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c	[moved from arch/arm/mach-s3c6400/setup-sdhci.c with 97% similarity]	diff \| blob \| history
arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c	[moved from arch/arm/mach-s3c6410/setup-sdhci.c with 97% similarity]	diff \| blob \| history

Beck SC1x5 Kernel

RSS Atom