diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 18:39:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 18:39:30 -0400 |
| commit | 98d86c091534f35c4bab294451ae6bccab8e9075 (patch) | |
| tree | 98c9f0b80bb078405cf173f1d5cc91c72e77082d /arch/sparc64/Kconfig | |
| parent | d875a4b0ffad754e6d89fa561ea7dcdd79c9508b (diff) | |
| parent | 4d084617fb0d025c42c242362d1f27d337e2d407 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc/kernel/of_device.c
Diffstat (limited to 'arch/sparc64/Kconfig')
| -rw-r--r-- | arch/sparc64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 4a90809b40fb..5446e2a499b1 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -254,6 +254,7 @@ endmenu | |||
| 254 | 254 | ||
| 255 | config NUMA | 255 | config NUMA |
| 256 | bool "NUMA support" | 256 | bool "NUMA support" |
| 257 | depends on SMP | ||
| 257 | 258 | ||
| 258 | config NODES_SHIFT | 259 | config NODES_SHIFT |
| 259 | int | 260 | int |