]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ab5d97d) | patch
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
authorBen Dooks <ben-linux@fluff.org>
Tue, 26 Jan 2010 01:11:04 +0000 (10:11 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 26 Jan 2010 01:16:32 +0000 (10:16 +0900)
commit431107ea5b680a24a4d01fbd3a178a3eb932f378
tree6515a616e8ed60480e169188e630936794be2c77tree
parentab5d97db1c6ced3e95c00d097931471707032b1fcommit | 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>
58 files changed:
arch/arm/Kconfig diff | blob | blame | history
arch/arm/Makefile diff | blob | blame | history
arch/arm/mach-s3c6400/Kconfig [deleted file] blob | blame | history
arch/arm/mach-s3c6400/Makefile [deleted file] blob | blame | history
arch/arm/mach-s3c6400/Makefile.boot [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/debug-macro.S [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/dma.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/entry-macro.S [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/gpio.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/hardware.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/irqs.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/map.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/memory.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/pwm-clock.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/regs-clock.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/regs-fb.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/regs-irq.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/system.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/tick.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/include/mach/uncompress.h [deleted file] blob | blame | history
arch/arm/mach-s3c6400/mach-smdk6400.c [deleted file] blob | blame | history
arch/arm/mach-s3c6400/s3c6400.c [deleted file] blob | blame | history
arch/arm/mach-s3c6400/setup-sdhci.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/Kconfig [deleted file] blob | blame | history
arch/arm/mach-s3c6410/Makefile [deleted file] blob | blame | history
arch/arm/mach-s3c6410/cpu.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/mach-anw6410.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/mach-hmt.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/mach-ncp.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/mach-smdk6410.c [deleted file] blob | blame | history
arch/arm/mach-s3c6410/setup-sdhci.c [deleted file] blob | blame | history
arch/arm/mach-s3c64xx/Kconfig [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/Makefile [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/Makefile.boot [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/debug-macro.S [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/dma.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/entry-macro.S [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/gpio.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/hardware.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/irqs.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/map.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/memory.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/pwm-clock.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/regs-clock.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/regs-fb.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/regs-irq.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/system.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/tick.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/include/mach/uncompress.h [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/mach-anw6410.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/mach-hmt.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/mach-ncp.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/mach-smdk6400.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/mach-smdk6410.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/s3c6400.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/s3c6410.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/setup-sdhci-s3c6400.c [new file with mode: 0644] blob
arch/arm/mach-s3c64xx/setup-sdhci-s3c6410.c [new file with mode: 0644] blob
Ubuntu Artful kernel mirror