diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/ia64/Kconfig | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 09ce2ab792e1..464ba6678b87 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -75,10 +75,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 75 | bool | 75 | bool |
| 76 | default y | 76 | default y |
| 77 | 77 | ||
| 78 | config GENERIC_TIME | ||
| 79 | bool | ||
| 80 | default y | ||
| 81 | |||
| 82 | config GENERIC_TIME_VSYSCALL | 78 | config GENERIC_TIME_VSYSCALL |
| 83 | bool | 79 | bool |
| 84 | default y | 80 | default y |
| @@ -496,8 +492,7 @@ config USE_PERCPU_NUMA_NODE_ID | |||
| 496 | depends on NUMA | 492 | depends on NUMA |
| 497 | 493 | ||
| 498 | config HAVE_MEMORYLESS_NODES | 494 | config HAVE_MEMORYLESS_NODES |
| 499 | def_bool y | 495 | def_bool NUMA |
| 500 | depends on NUMA | ||
| 501 | 496 | ||
| 502 | config ARCH_PROC_KCORE_TEXT | 497 | config ARCH_PROC_KCORE_TEXT |
| 503 | def_bool y | 498 | def_bool y |