diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:15:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:15:20 +0200 |
| commit | 424663566c43ce87e8b33228860bf882f1ea61bf (patch) | |
| tree | 07b53452a890979f414493f569b5831a5e05545a /arch/arm/Makefile | |
| parent | eedd52e3c462d5434412fd0b7bc183ed76d3a4a8 (diff) | |
| parent | 163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (diff) | |
| download | linux-424663566c43ce87e8b33228860bf882f1ea61bf.tar.gz linux-424663566c43ce87e8b33228860bf882f1ea61bf.tar.bz2 linux-424663566c43ce87e8b33228860bf882f1ea61bf.zip | |
Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup2
Kukjin Kim <kgene.kim@samsung.com> writes:
We can remove plat-s5p directory with this series and I think, the
plat-s3c24xx can be removed next time for one plat-samsung of Samsung
stuff.
Note, this is including cleanup-samsung-iommu which is removing s5p
iommu stuff in plat-s5p.
* 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: merge plat-s5p into plat-samsung
ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
ARM: SAMSUNG: move pm part for common s5p into plat-samsung
ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
ARM: S3C24XX: Use common macro to define resources on dev-uart.c
ARM: S3C24XX: move common clock init into common.c
ARM: S3C24XX: move common power-management code to mach-s3c24xx
ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
ARM: S3C24XX: move plat-s3c24xx/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7a6bde07e787..292bd483a8d8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -207,7 +207,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik plat-$(CONFIG_PLAT_ORION) := orion plat-$(CONFIG_PLAT_PXA) := pxa plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung -plat-$(CONFIG_PLAT_S5P) := s5p samsung +plat-$(CONFIG_PLAT_S5P) := samsung plat-$(CONFIG_PLAT_SPEAR) := spear plat-$(CONFIG_PLAT_VERSATILE) := versatile |