diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /arch/m32r/Kconfig | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/m32r/Kconfig')
| -rw-r--r-- | arch/m32r/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 7772951df313..7622d4ec5f08 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -269,7 +269,7 @@ config NR_CPUS | |||
| 269 | # Common NUMA Features | 269 | # Common NUMA Features |
| 270 | config NUMA | 270 | config NUMA |
| 271 | bool "Numa Memory Allocation Support" | 271 | bool "Numa Memory Allocation Support" |
| 272 | depends on SMP | 272 | depends on SMP && BROKEN |
| 273 | default n | 273 | default n |
| 274 | 274 | ||
| 275 | # turning this on wastes a bunch of space. | 275 | # turning this on wastes a bunch of space. |
| @@ -286,6 +286,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | |||
| 286 | 286 | ||
| 287 | config PCI | 287 | config PCI |
| 288 | bool "PCI support" | 288 | bool "PCI support" |
| 289 | depends on BROKEN | ||
| 289 | default n | 290 | default n |
| 290 | help | 291 | help |
| 291 | Find out whether you have a PCI motherboard. PCI is the name of a | 292 | Find out whether you have a PCI motherboard. PCI is the name of a |