From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 24 May 2010 19:34:20 +0000 (+0100)
Subject: Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: v2.6.35-rc1~264^2~1^2
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=d472d1a1c82ade81d2854db2ff4c9694ed66612e;p=cascardo%2Flinux.git

Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig
---

d472d1a1c82ade81d2854db2ff4c9694ed66612e
diff --cc arch/arm/Kconfig
index 2d70cece2ea2,550c038451a7..62065531b639
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -876,9 -894,7 +880,9 @@@ source "arch/arm/mach-sa1100/Kconfig
  source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s5p/Kconfig"
- source "arch/arm/plat-s5pc1xx/Kconfig"
+ 
 +source "arch/arm/plat-spear/Kconfig"
 +
  if ARCH_S3C2410
  source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"
diff --cc arch/arm/Makefile
index 4b857fbe4314,f7cb6d495484..64ba313724d2
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -198,10 -192,7 +198,9 @@@ plat-$(CONFIG_PLAT_NOMADIK)	:= nomadi
  plat-$(CONFIG_PLAT_ORION)	:= orion
  plat-$(CONFIG_PLAT_PXA)		:= pxa
  plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung
- plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung
  plat-$(CONFIG_PLAT_S5P)		:= s5p samsung
 +plat-$(CONFIG_PLAT_SPEAR)	:= spear
 +plat-$(CONFIG_PLAT_VERSATILE)	:= versatile
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.