Merge branch 'devel-stable' into devel

[linux-2.6-block.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 7603eba7c0cd314890a0d2264d117ca16314d566..fa0cdab2e1d3109d75418f2022314dd796f8f0da 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -122,6 +122,7 @@ machine-$(CONFIG_ARCH_AT91)         := at91
 machine-$(CONFIG_ARCH_BCMRING)         := bcmring
 machine-$(CONFIG_ARCH_CLPS711X)                := clps711x
 machine-$(CONFIG_ARCH_DAVINCI)         := davinci
+machine-$(CONFIG_ARCH_DOVE)            := dove
 machine-$(CONFIG_ARCH_EBSA110)         := ebsa110
 machine-$(CONFIG_ARCH_EP93XX)          := ep93xx
 machine-$(CONFIG_ARCH_GEMINI)          := gemini
@@ -180,9 +181,9 @@ plat-$(CONFIG_PLAT_IOP)             := iop
 plat-$(CONFIG_PLAT_NOMADIK)    := nomadik
 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)