diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 22:31:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-30 22:31:20 -0500 |
commit | 528ba4ef855bd184b7d68e3fa596b420fb4fa86a (patch) | |
tree | 9b7a296f2ae3942ca401bd099ae92d00bbe366a9 /arch/mips/Kconfig | |
parent | df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc (diff) | |
parent | 21e9ac7b2dd96dfca997313bae6d9a8f642635c7 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] MIPS doesn't need compat_sys_getdents.
[MIPS] JMR3927: Fixup another victim of the irq pt_regs cleanup.
[MIPS] EMMA 2 / Markeins: struct resource takes physical addresses.
[MIPS] EMMA 2 / Markeins: Convert to name struct resource initialization.
[MIPS] EMMA 2 / Markeins: Formitting fixes split from actual address fixes.
[MIPS] EMMA 2 / Markeins: Fix build wreckage due to genirq wreckage.
[MIPS] Ocelot G: Fix build error and numerous warnings.
[MIPS] Fix return value of TXX9 SPI interrupt handler
[MIPS] Au1000: Fix warning about unused variable.
[MIPS] Wire up getcpu(2) and epoll_wait(2) syscalls.
[MIPS] Make SB1 cache flushes not to use on_each_cpu
[MIPS] Fix warning about unused definition in c-sb1.c
[MIPS] SMTC: Make 8 the default number of processors.
[MIPS] Oprofile: Fix MIPSxx counter number detection.
[MIPS] Au1xx0 code sets incorrect mips_hpt_frequency
[MIPS] Oprofile: fix on non-VSMP / non-SMTC SMP configurations.
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 14af6cce2fa2..74ba76378113 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -408,7 +408,7 @@ config MOMENCO_OCELOT_C | |||
408 | select SWAP_IO_SPACE | 408 | select SWAP_IO_SPACE |
409 | select SYS_HAS_CPU_RM7000 | 409 | select SYS_HAS_CPU_RM7000 |
410 | select SYS_SUPPORTS_32BIT_KERNEL | 410 | select SYS_SUPPORTS_32BIT_KERNEL |
411 | select SYS_SUPPORTS_64BIT_KERNEL | 411 | select SYS_SUPPORTS_64BIT_KERNEL if BROKEN |
412 | select SYS_SUPPORTS_BIG_ENDIAN | 412 | select SYS_SUPPORTS_BIG_ENDIAN |
413 | help | 413 | help |
414 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by | 414 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by |
@@ -1690,6 +1690,7 @@ config NR_CPUS | |||
1690 | depends on SMP | 1690 | depends on SMP |
1691 | default "64" if SGI_IP27 | 1691 | default "64" if SGI_IP27 |
1692 | default "2" | 1692 | default "2" |
1693 | default "8" if MIPS_MT_SMTC | ||
1693 | help | 1694 | help |
1694 | This allows you to specify the maximum number of CPUs which this | 1695 | This allows you to specify the maximum number of CPUs which this |
1695 | kernel will support. The maximum supported value is 32 for 32-bit | 1696 | kernel will support. The maximum supported value is 32 for 32-bit |