diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-19 14:46:52 -0500 |
| commit | 828aac2ee239dca9c1856c4856a57912e6a487c4 (patch) | |
| tree | 44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/Kconfig | |
| parent | 6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff) | |
| parent | 7971db5a4b4176ad5df590fce07a962c643a2740 (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/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f1a3b10cfa9e..4f870207f496 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -156,7 +156,6 @@ config ARCH_MTD_XIP | |||
| 156 | bool | 156 | bool |
| 157 | 157 | ||
| 158 | config GENERIC_HARDIRQS_NO__DO_IRQ | 158 | config GENERIC_HARDIRQS_NO__DO_IRQ |
| 159 | bool | ||
| 160 | def_bool y | 159 | def_bool y |
| 161 | 160 | ||
| 162 | if OPROFILE | 161 | if OPROFILE |
| @@ -288,6 +287,8 @@ config ARCH_NETX | |||
| 288 | bool "Hilscher NetX based" | 287 | bool "Hilscher NetX based" |
| 289 | select CPU_ARM926T | 288 | select CPU_ARM926T |
| 290 | select ARM_VIC | 289 | select ARM_VIC |
| 290 | select GENERIC_CLOCKEVENTS | ||
| 291 | select GENERIC_TIME | ||
| 291 | help | 292 | help |
| 292 | This enables support for systems based on the Hilscher NetX Soc | 293 | This enables support for systems based on the Hilscher NetX Soc |
| 293 | 294 | ||