diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/x86/Kconfig | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0eacb1ffb421..9458685902bd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1216,8 +1216,8 @@ config NUMA_EMU | |||
| 1216 | 1216 | ||
| 1217 | config NODES_SHIFT | 1217 | config NODES_SHIFT |
| 1218 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP | 1218 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP |
| 1219 | range 1 9 | 1219 | range 1 10 |
| 1220 | default "9" if MAXSMP | 1220 | default "10" if MAXSMP |
| 1221 | default "6" if X86_64 | 1221 | default "6" if X86_64 |
| 1222 | default "4" if X86_NUMAQ | 1222 | default "4" if X86_NUMAQ |
| 1223 | default "3" | 1223 | default "3" |