git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
arch
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index
617925d
..
a6d0306
100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-55,7
+55,6
@@
config CRIS
default y
select HAVE_IDE
select HAVE_GENERIC_HARDIRQS
- select GENERIC_HARDIRQS_NO_DEPRECATED
select GENERIC_IRQ_SHOW
config HZ