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

diff --combined arch/arm/mach-pxa/Kconfig
index fdb966e,dee9218..385c30e
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -37,6 -37,8 +37,8 @@@ config MACH_ZYLONITE32
  config MACH_LITTLETON
        bool "PXA3xx Form Factor Platform (aka Littleton)"
        select PXA3xx
+       select CPU_PXA300
+       select CPU_PXA310
        select PXA_SSP
  
  config MACH_TAVOREVB
@@@ -415,24 -417,6 +417,24 @@@ config MACH_TREO68
          Say Y here if you intend to run this kernel on Palm Treo 680
          smartphone.
  
 +config MACH_RAUMFELD_RC
 +      bool "Raumfeld Controller"
 +      select PXA3xx
 +      select CPU_PXA300
 +      select HAVE_PWM
 +
 +config MACH_RAUMFELD_CONNECTOR
 +      bool "Raumfeld Connector"
 +      select PXA3xx
 +      select CPU_PXA300
 +      select PXA_SSP
 +
 +config MACH_RAUMFELD_SPEAKER
 +      bool "Raumfeld Speaker"
 +      select PXA3xx
 +      select CPU_PXA300
 +      select PXA_SSP
 +
  config PXA_SHARPSL
        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
        select SHARP_SCOOP