From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 2 Mar 2010 23:40:15 +0000 (+0000)
Subject: Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: upstream/snapshot3+hdmi~15090^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=882d01f96bc1909455696aae6eb7ce4df3e908c8;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
---

882d01f96bc1909455696aae6eb7ce4df3e908c8
diff --cc arch/arm/Kconfig
index ee74c3a,9adc7e5..14b0368
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -837,21 -833,50 +865,25 @@@ endi
  
  source "arch/arm/mach-s5p6440/Kconfig"
  
- source "arch/arm/mach-shmobile/Kconfig"
- 
- source "arch/arm/plat-stmp3xxx/Kconfig"
+ source "arch/arm/mach-s5p6442/Kconfig"
  
 -source "arch/arm/plat-stmp3xxx/Kconfig"
 -
  if ARCH_S5PC1XX
  source "arch/arm/mach-s5pc100/Kconfig"
  endif
  
+ source "arch/arm/mach-s5pv210/Kconfig"
+ 
 -source "arch/arm/mach-lh7a40x/Kconfig"
 -
 -source "arch/arm/mach-h720x/Kconfig"
 -
 -source "arch/arm/mach-versatile/Kconfig"
 -
 -source "arch/arm/mach-aaec2000/Kconfig"
 -
 -source "arch/arm/mach-realview/Kconfig"
 -
 -source "arch/arm/mach-at91/Kconfig"
 -
 -source "arch/arm/plat-mxc/Kconfig"
++source "arch/arm/mach-shmobile/Kconfig"
+ 
 -source "arch/arm/mach-nomadik/Kconfig"
 -source "arch/arm/plat-nomadik/Kconfig"
 -
 -source "arch/arm/mach-netx/Kconfig"
 -
 -source "arch/arm/mach-ns9xxx/Kconfig"
 -
 -source "arch/arm/mach-davinci/Kconfig"
 -
 -source "arch/arm/mach-ks8695/Kconfig"
 -
 -source "arch/arm/mach-msm/Kconfig"
++source "arch/arm/plat-stmp3xxx/Kconfig"
+ 
  source "arch/arm/mach-u300/Kconfig"
  
 -source "arch/arm/mach-w90x900/Kconfig"
 +source "arch/arm/mach-ux500/Kconfig"
  
 -source "arch/arm/mach-bcmring/Kconfig"
 +source "arch/arm/mach-versatile/Kconfig"
  
 -source "arch/arm/mach-ux500/Kconfig"
 +source "arch/arm/mach-w90x900/Kconfig"
  
  # Definitions to make life easier
  config ARCH_ACORN
diff --cc arch/arm/Makefile
index 10e933b,2703222..2dca13f
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -160,14 -158,15 +160,16 @@@ machine-$(CONFIG_ARCH_PNX4008)		:= pnx4
  machine-$(CONFIG_ARCH_PXA)		:= pxa
  machine-$(CONFIG_ARCH_REALVIEW)		:= realview
  machine-$(CONFIG_ARCH_RPC)		:= rpc
- machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
+ machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2443
  machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0
- machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410
+ machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx
  machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440
+ machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442
  machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100
+ machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210
  machine-$(CONFIG_ARCH_SA1100)		:= sa1100
  machine-$(CONFIG_ARCH_SHARK)		:= shark
 +machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile
  machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x
  machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx
  machine-$(CONFIG_ARCH_U300)		:= u300
@@@ -180,15 -180,15 +182,15 @@@ machine-$(CONFIG_FOOTBRIDGE)		:= footbr
  # by CONFIG_* macro name.
  plat-$(CONFIG_ARCH_MXC)		:= mxc
  plat-$(CONFIG_ARCH_OMAP)	:= omap
++plat-$(CONFIG_ARCH_S3C64XX)	:= samsung
 +plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx
  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 samsung
- plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung
- plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung
- plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c
+ plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung
 -plat-$(CONFIG_ARCH_S3C64XX)	:= samsung
+ plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung
+ plat-$(CONFIG_PLAT_S5P)		:= s5p samsung
 -plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.