summaryrefslogtreecommitdiffstats
path: root/arch/score/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-30 09:07:39 +0200
committerIngo Molnar <mingo@elte.hu>2011-03-30 09:07:43 +0200
commit9f644c4ba86b76159d36747fda7da496f72a1872 (patch)
tree31e025a5f283aff691fb636bf07fd0b445cf07a3 /arch/score/Kconfig
parent1b7155f7de119870f0d3fad89f125de2ff6c16be (diff)
parent0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff)
downloadop-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.zip
op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.tar.gz
Merge commit 'v2.6.39-rc1' into perf/urgent
Merge reason: use the post-merge-window tree. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/score/Kconfig')
-rw-r--r--arch/score/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 27b2295..4278bbc 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -3,6 +3,8 @@ menu "Machine selection"
config SCORE
def_bool y
select HAVE_GENERIC_HARDIRQS
+ select GENERIC_HARDIRQS_NO_DEPRECATED
+ select GENERIC_IRQ_SHOW
choice
prompt "System type"
OpenPOWER on IntegriCloud