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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
score
/
Kconfig
diff --git
a/arch/score/Kconfig
b/arch/score/Kconfig
index
5cbc148
..
4293fdc
100644
(file)
--- a/
arch/score/Kconfig
+++ b/
arch/score/Kconfig
@@
-50,9
+50,6
@@
config GENERIC_CALIBRATE_DELAY
config GENERIC_CLOCKEVENTS
def_bool y
-config GENERIC_TIME
- def_bool y
-
config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y