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 branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
score
/
Kconfig
diff --git
a/arch/score/Kconfig
b/arch/score/Kconfig
index
4293fdc
..
27b2295
100644
(file)
--- a/
arch/score/Kconfig
+++ b/
arch/score/Kconfig
@@
-1,5
+1,9
@@
menu "Machine selection"
menu "Machine selection"
+config SCORE
+ def_bool y
+ select HAVE_GENERIC_HARDIRQS
+
choice
prompt "System type"
default MACH_SPCT6600
choice
prompt "System type"
default MACH_SPCT6600
@@
-53,9
+57,6
@@
config GENERIC_CLOCKEVENTS
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y
-config GENERIC_HARDIRQS_NO__DO_IRQ
- def_bool y
-
config GENERIC_SYSCALL_TABLE
def_bool y
config GENERIC_SYSCALL_TABLE
def_bool y
@@
-68,9
+69,6
@@
menu "Kernel type"
config 32BIT
def_bool y
config 32BIT
def_bool y
-config GENERIC_HARDIRQS
- def_bool y
-
config ARCH_FLATMEM_ENABLE
def_bool y
config ARCH_FLATMEM_ENABLE
def_bool y