aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
commit602fd7c36728a04e61a442c9755e7d454501266c (patch)
tree6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/Makefile
parentd7931d9f7ab9de9158c6905caae979999134ad4d (diff)
parent88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff)
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2ddc323b1c6..8c0d08fbd99 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -179,9 +179,9 @@ plat-$(CONFIG_ARCH_OMAP) := omap
plat-$(CONFIG_PLAT_IOP) := iop
plat-$(CONFIG_PLAT_ORION) := orion
plat-$(CONFIG_PLAT_PXA) := pxa
-plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
-plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
-plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c
+plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
+plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
+plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
ifeq ($(CONFIG_ARCH_EBSA110),y)