Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

diff --combined arch/arm/Kconfig
index 93d595a7477a174c41f5822372fef2700044261c,f4027abac8aaed757e735c3c21fcb4035a1b05b9..4f8f3a4e4e0df820ab19061a100f715bfebb4796
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -235,7 -235,6 +235,7 @@@ config ARCH_INTEGRATO
        select ICST
        select GENERIC_CLOCKEVENTS
        select PLAT_VERSATILE
 +      select PLAT_VERSATILE_FPGA_IRQ
        help
          Support for ARM's Integrator platform.
  
@@@ -243,11 -242,11 +243,11 @@@ config ARCH_REALVIE
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select CLKDEV_LOOKUP
 -      select HAVE_SCHED_CLOCK
        select ICST
        select GENERIC_CLOCKEVENTS
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PLAT_VERSATILE
 +      select PLAT_VERSATILE_CLCD
        select ARM_TIMER_SP804
        select GPIO_PL061 if GPIOLIB
        help
@@@ -258,12 -257,11 +258,12 @@@ config ARCH_VERSATIL
        select ARM_AMBA
        select ARM_VIC
        select CLKDEV_LOOKUP
 -      select HAVE_SCHED_CLOCK
        select ICST
        select GENERIC_CLOCKEVENTS
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PLAT_VERSATILE
 +      select PLAT_VERSATILE_CLCD
 +      select PLAT_VERSATILE_FPGA_IRQ
        select ARM_TIMER_SP804
        help
          This enables support for ARM Ltd Versatile board.
@@@ -276,10 -274,9 +276,10 @@@ config ARCH_VEXPRES
        select CLKDEV_LOOKUP
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
 -      select HAVE_SCHED_CLOCK
 +      select HAVE_PATA_PLATFORM
        select ICST
        select PLAT_VERSATILE
 +      select PLAT_VERSATILE_CLCD
        help
          This enables support for the ARM Ltd Versatile Express boards.
  
@@@ -365,6 -362,7 +365,7 @@@ config ARCH_MX
        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+       select HAVE_SCHED_CLOCK
        help
          Support for Freescale MXC/iMX-based family of processors
  
@@@ -1014,7 -1012,6 +1015,7 @@@ source "arch/arm/mach-ux500/Kconfig
  source "arch/arm/mach-versatile/Kconfig"
  
  source "arch/arm/mach-vexpress/Kconfig"
 +source "arch/arm/plat-versatile/Kconfig"
  
  source "arch/arm/mach-vt8500/Kconfig"