From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 5 Dec 2009 10:35:33 +0000 (+0000)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: upstream/snapshot3+hdmi~16445^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0719dc341389882cc834ed18fc9b7fc6006b2b85;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'devel-stable' into devel
---

0719dc341389882cc834ed18fc9b7fc6006b2b85
diff --cc arch/arm/Makefile
index 7603eba,8c0d08f..fa0cdab
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -177,12 -177,11 +178,12 @@@ machine-$(CONFIG_ARCH_MXC91231)		:= mxc
  plat-$(CONFIG_ARCH_MXC)		:= mxc
  plat-$(CONFIG_ARCH_OMAP)	:= omap
  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)