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

diff --combined arch/arm/Kconfig
index 3806d63,3f8718f..ae0ecda
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -297,15 -297,6 +297,15 @@@ config ARCH_CLPS711
        help
          Support for Cirrus Logic 711x/721x based boards.
  
 +config ARCH_CNS3XXX
 +      bool "Cavium Networks CNS3XXX family"
 +      select CPU_V6
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      select ARM_GIC
 +      help
 +        Support for Cavium Networks CNS3XXX platform.
 +
  config ARCH_GEMINI
        bool "Cortina Systems Gemini"
        select CPU_FA526
@@@ -610,15 -601,14 +610,15 @@@ config ARCH_PX
  
  config ARCH_MSM
        bool "Qualcomm MSM"
 -      select CPU_V6
 +      select HAVE_CLK
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
 -        Support for Qualcomm MSM7K based systems.  This runs on the ARM11
 -        apps processor of the MSM7K and depends on a shared memory
 -        interface to the ARM9 modem processor which runs the baseband stack
 -        and controls some vital subsystems (clock and power control, etc).
 +        Support for Qualcomm MSM/QSD based systems.  This runs on the
 +        apps processor of the MSM/QSD and depends on a shared memory
 +        interface to the modem processor which runs the baseband
 +        stack and controls some vital subsystems
 +        (clock and power control, etc).
  
  config ARCH_SHMOBILE
        bool "Renesas SH-Mobile"
@@@ -657,7 -647,7 +657,7 @@@ config ARCH_SA110
          Support for StrongARM 11x0 based boards.
  
  config ARCH_S3C2410
-       bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
+       bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"
        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
        select HAVE_CLK
@@@ -666,6 -656,10 +666,10 @@@
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
          the Samsung SMDK2410 development board (and derivatives).
  
+         Note, the S3C2416 and the S3C2450 are so close that they even share
+         the same SoC ID code. This means that there is no seperate machine
+         directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.
+ 
  config ARCH_S3C64XX
        bool "Samsung S3C64XX"
        select PLAT_SAMSUNG
@@@ -827,8 -821,6 +831,8 @@@ source "arch/arm/mach-bcmring/Kconfig
  
  source "arch/arm/mach-clps711x/Kconfig"
  
 +source "arch/arm/mach-cns3xxx/Kconfig"
 +
  source "arch/arm/mach-davinci/Kconfig"
  
  source "arch/arm/mach-dove/Kconfig"
@@@ -904,6 -896,7 +908,7 @@@ if ARCH_S3C241
  source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"
  source "arch/arm/mach-s3c2412/Kconfig"
+ source "arch/arm/mach-s3c2416/Kconfig"
  source "arch/arm/mach-s3c2440/Kconfig"
  source "arch/arm/mach-s3c2443/Kconfig"
  endif

diff --combined arch/arm/Makefile
index 3e312ec,1594739..7cdaf5a
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -121,7 -121,6 +121,7 @@@ machine-$(CONFIG_ARCH_AAEC2000)            := aae
  machine-$(CONFIG_ARCH_AT91)           := at91
  machine-$(CONFIG_ARCH_BCMRING)                := bcmring
  machine-$(CONFIG_ARCH_CLPS711X)               := clps711x
 +machine-$(CONFIG_ARCH_CNS3XXX)                := cns3xxx
  machine-$(CONFIG_ARCH_DAVINCI)                := davinci
  machine-$(CONFIG_ARCH_DOVE)           := dove
  machine-$(CONFIG_ARCH_EBSA110)                := ebsa110
@@@ -161,7 -160,7 +161,7 @@@ 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 s3c2443
+ machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443
  machine-$(CONFIG_ARCH_S3C24A0)                := s3c24a0
  machine-$(CONFIG_ARCH_S3C64XX)                := s3c64xx
  machine-$(CONFIG_ARCH_S5P6440)                := s5p6440