Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
  ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
  ARM: S3C2443: Remove #if 0 for clk_mpll
  ARM: S3C2443: Update notes on MPLLREF clock
  ARM: S3C2443: Further clksrc-clk conversions
  ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
  USB: Fix s3c-hsotg build following Samsung platform header moves
  ARM: S3C64XX: Reintroduce unconditional build of audio device
  ARM: 5961/1: ux500: fix CLKRST addresses
  ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
  ASoC: Fix S3C64xx IIS driver for Samsung header reorg
  ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
  [ARM] pxa: fix typo in mxm8x10.h
  [ARM] pxa/raumfeld: set GPIO drive bits for LED pins
  [ARM] pxa/zeus: Add support for mcp2515 CAN bus
  [ARM] pxa/zeus: Add support for onboard max6369 watchdog
  [ARM] pxa/zeus: Add Eurotech as the manufacturer
  [ARM] pxa/zeus: Correct the USB host initialisation flags
  [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
  [ARM] pxa: refactor uncompress.h for non-PXA uarts
  [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
  ...

1 files changed, 35 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index dee92182749b..38fbd0a0e402 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -115,6 +115,11 @@ config MACH_CM_X300
         select CPU_PXA310
         select HAVE_PWM
 
+config MACH_CAPC7117
+        bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM"
+        select CPU_PXA320
+        select PXA3xx
+
 config ARCH_GUMSTIX
         bool "Gumstix XScale 255 boards"
         select PXA25x
@@ -417,6 +422,24 @@ config MACH_TREO680
           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
@@ -435,6 +458,7 @@ config SHARPSL_PM
 config CORGI_SSP_DEPRECATED
         bool
         select PXA_SSP
+        select PXA_SSP_LEGACY
         help
           This option will include corgi_ssp.c and corgi_lcd.c
           that corgi_ts.c and other legacy drivers (corgi_bl.c
@@ -446,6 +470,7 @@ config MACH_POODLE
         select PXA25x
         select SHARP_LOCOMO
         select PXA_SSP
+        select PXA_HAVE_BOARD_IRQS
 
 config MACH_CORGI
         bool "Enable Sharp SL-C700 (Corgi) Support"
@@ -492,6 +517,11 @@ config MACH_TOSA
         select PXA25x
         select PXA_HAVE_BOARD_IRQS
 
+config MACH_ICONTROL
+        bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM"
+        select CPU_PXA320
+        select PXA3xx
+
 config ARCH_PXA_ESERIES
         bool "PXA based Toshiba e-series PDAs"
         select PXA25x
@@ -629,6 +659,11 @@ config PXA_SSP
         help
           Enable support for PXA2xx SSP ports
 
+config PXA_SSP_LEGACY
+        bool
+        help
+          Support of legacy SSP API
+
 config TOSA_BT
         tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
         depends on MACH_TOSA