diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:04:59 +0900 |
| commit | 2de05a57467c43f58802cdeaa547aee73396b6f3 (patch) | |
| tree | e73f96c9954479a6909eb6195631284eac0fa47f /arch/arm/Makefile | |
| parent | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (diff) | |
| parent | 380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff) | |
| download | op-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.zip op-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.tar.gz | |
Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
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 047a207..f55b509 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -209,7 +209,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 |
