aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-12 18:11:38 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-12 18:52:54 -0400
commit199642bfe107c411f25fbfc16c9fd49cfef9785d (patch)
treea2ca24d98d38d389c0dc5ae69cce82df4d2dd14a /arch/arm/Makefile
parente033ca9bfa0831889d7b8fdad516c771ad200e41 (diff)
ARM: SAMSUNG: merge plat-s5p into plat-samsung
Since just plat-samsung can support all of Samsung stuff so that there is no more need to keep the plat-s5p for S5P SoCs. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 047a20780fc1..f55b509d35c4 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -209,7 +209,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik
209plat-$(CONFIG_PLAT_ORION) := orion 209plat-$(CONFIG_PLAT_ORION) := orion
210plat-$(CONFIG_PLAT_PXA) := pxa 210plat-$(CONFIG_PLAT_PXA) := pxa
211plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung 211plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung
212plat-$(CONFIG_PLAT_S5P) := s5p samsung 212plat-$(CONFIG_PLAT_S5P) := samsung
213plat-$(CONFIG_PLAT_SPEAR) := spear 213plat-$(CONFIG_PLAT_SPEAR) := spear
214plat-$(CONFIG_PLAT_VERSATILE) := versatile 214plat-$(CONFIG_PLAT_VERSATILE) := versatile
215 215