From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 19 Dec 2008 19:46:52 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
X-Git-Tag: v2.6.29-rc1~559^2~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=828aac2ee239dca9c1856c4856a57912e6a487c4;p=linux-2.6-omap-h63xx.git

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

828aac2ee239dca9c1856c4856a57912e6a487c4
diff --cc arch/arm/Kconfig
index f1a3b10cfa9,fb2877526d5..4f870207f49
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -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