Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
287,164 Commits 7 Branches 865 Tags 6.5 GiB
9072dc983f
Commit Graph

3 Commits

Author SHA1 Message Date
Kukjin Kim
880bcd4a83 Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx 
Conflicts:
	arch/arm/mach-s3c24xx/include/mach/system.h
 2012-03-07 01:36:33 -08:00
Kukjin Kim
dd6f01b5cc ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/ 
This patch moves S3C2440 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-03-03 08:55:17 +09:00
Kukjin Kim
85fd6d63bf ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/ 
This patch moves S3C2410 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile
- removed unused option, MACH_N35
- fixed duplcated option name, S3C2410_DMA to S3C24XX_DMA which is
  in plat-s3c24xx/

Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
 2012-03-03 07:47:38 +09:00