aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-19 19:46:52 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-19 19:46:52 +0000
commit828aac2ee239dca9c1856c4856a57912e6a487c4 (patch)
tree44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/Kconfig
parent6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff)
parent7971db5a4b4176ad5df590fce07a962c643a2740 (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f1a3b10cfa9..4f870207f49 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -156,7 +156,6 @@ config ARCH_MTD_XIP
bool
config GENERIC_HARDIRQS_NO__DO_IRQ
- bool
def_bool y
if OPROFILE
@@ -288,6 +287,8 @@ 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