summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-16 15:53:15 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-16 15:53:15 +0200
commita551204badbea5119a84ee4f03faefce9f2c0543 (patch)
tree8592f756c984f376be13cf839c4815ff8a7266a6 /arch/arm/Makefile
parent26625ddadbe9cd5791c9d64b0425821b036c5188 (diff)
parent199642bfe107c411f25fbfc16c9fd49cfef9785d (diff)
downloadblackbird-op-linux-a551204badbea5119a84ee4f03faefce9f2c0543.tar.gz
blackbird-op-linux-a551204badbea5119a84ee4f03faefce9f2c0543.zip
Merge branch 'samsung/cleanup-plat-s5p' into next/soc2
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 2aa75b58bf12..fcc2170d2cd7 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -211,7 +211,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
OpenPOWER on IntegriCloud