Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 19 Dec 2008 19:46:52 +0000 (19:46 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 19 Dec 2008 19:46:52 +0000 (19:46 +0000)
1  2 
arch/arm/Kconfig

index f1a3b10cfa9e850508f6e8e4615e53eac5548ba1,fb2877526d58b8194b2e92839bdf2904dba84e5b..4f870207f496617a4b2cd480f5667ae5ddab2c61
@@@ -286,8 -285,9 +285,10 @@@ config ARCH_FOOTBRIDG
  
  config ARCH_NETX
        bool "Hilscher NetX based"
 +      select CPU_ARM926T
        select ARM_VIC
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_TIME
        help
          This enables support for systems based on the Hilscher NetX Soc