Merge branch 'for-rmk-misc' into for-rmk

diff --combined arch/arm/Kconfig
index 1bce9ca,65f423c..fb28775
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -156,7 -156,6 +156,6 @@@ config ARCH_MTD_XI
        bool
  
  config GENERIC_HARDIRQS_NO__DO_IRQ
-       bool
        def_bool y
  
  if OPROFILE
@@@ -287,8 -286,6 +286,8 @@@ config ARCH_FOOTBRIDG
  config ARCH_NETX
        bool "Hilscher NetX based"
        select ARM_VIC
 +      select GENERIC_CLOCKEVENTS
 +      select GENERIC_TIME
        help
          This enables support for systems based on the Hilscher NetX Soc