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 'kbuild/rc-fixes' into kbuild/kconfig
[pandora-kernel.git]
/
arch
/
ia64
/
Kconfig
diff --git
a/arch/ia64/Kconfig
b/arch/ia64/Kconfig
index
09ce2ab
..
464ba66
100644
(file)
--- a/
arch/ia64/Kconfig
+++ b/
arch/ia64/Kconfig
@@
-75,10
+75,6
@@
config GENERIC_CALIBRATE_DELAY
bool
default y
-config GENERIC_TIME
- bool
- default y
-
config GENERIC_TIME_VSYSCALL
bool
default y
@@
-496,8
+492,7
@@
config USE_PERCPU_NUMA_NODE_ID
depends on NUMA
config HAVE_MEMORYLESS_NODES
- def_bool y
- depends on NUMA
+ def_bool NUMA
config ARCH_PROC_KCORE_TEXT
def_bool y