Merge branch 'shmobile' into devel

diff --combined arch/arm/Kconfig
index 78589a1b0d0379ae438587fa5127e0e440185a1c,db4f2ee3a75023d1f7df1b1ef1ca38dc7d4b842b..34cef2546e428685896baf05170f48ced2c8d7c6
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -439,6 -439,21 +439,6 @@@ config ARCH_IXP4X
        help
          Support for Intel's IXP4XX (XScale) family of processors.
  
 -config ARCH_L7200
 -      bool "LinkUp-L7200"
 -      select CPU_ARM720T
 -      select FIQ
 -      select ARCH_USES_GETTIMEOFFSET
 -      help
 -        Say Y here if you intend to run this kernel on a LinkUp Systems
 -        L7200 Software Development Board which uses an ARM720T processor.
 -        Information on this board can be obtained at:
 -
 -        <http://www.linkupsys.com/>
 -
 -        If you have any questions or comments about the Linux kernel port
 -        to this board, send e-mail to <sjhill@cotw.com>.
 -
  config ARCH_DOVE
        bool "Marvell Dove"
        select PCI
@@@ -1170,9 -1185,11 +1170,10 @@@ source kernel/Kconfig.preemp
  
  config HZ
        int
 -      default 128 if ARCH_L7200
        default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
        default AT91_TIMER_HZ if ARCH_AT91
+       default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
        default 100
  
  config THUMB2_KERNEL