aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-04-02 00:08:05 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2006-04-02 00:08:05 -0500
commit95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch)
tree65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/mips/Kconfig
parent642fde17dceceb56c7ba2762733ac688666ae657 (diff)
parent683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)
Manual merge with Linus.
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig14
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6d4333776d28..e15709ce8866 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -604,7 +604,7 @@ config SGI_IP32
604 If you want this kernel to run on SGI O2 workstation, say Y here. 604 If you want this kernel to run on SGI O2 workstation, say Y here.
605 605
606config SIBYTE_BIGSUR 606config SIBYTE_BIGSUR
607 bool "Support for Sibyte BigSur" 607 bool "Support for Sibyte BCM91480B-BigSur"
608 select BOOT_ELF32 608 select BOOT_ELF32
609 select DMA_COHERENT 609 select DMA_COHERENT
610 select PCI_DOMAINS 610 select PCI_DOMAINS
@@ -793,6 +793,7 @@ source "arch/mips/tx4927/Kconfig"
793source "arch/mips/tx4938/Kconfig" 793source "arch/mips/tx4938/Kconfig"
794source "arch/mips/vr41xx/Kconfig" 794source "arch/mips/vr41xx/Kconfig"
795source "arch/mips/philips/pnx8550/common/Kconfig" 795source "arch/mips/philips/pnx8550/common/Kconfig"
796source "arch/mips/cobalt/Kconfig"
796 797
797endmenu 798endmenu
798 799
@@ -803,6 +804,14 @@ config RWSEM_GENERIC_SPINLOCK
803config RWSEM_XCHGADD_ALGORITHM 804config RWSEM_XCHGADD_ALGORITHM
804 bool 805 bool
805 806
807config GENERIC_FIND_NEXT_BIT
808 bool
809 default y
810
811config GENERIC_HWEIGHT
812 bool
813 default y
814
806config GENERIC_CALIBRATE_DELAY 815config GENERIC_CALIBRATE_DELAY
807 bool 816 bool
808 default y 817 default y
@@ -1162,6 +1171,7 @@ config CPU_R4X00
1162config CPU_TX49XX 1171config CPU_TX49XX
1163 bool "R49XX" 1172 bool "R49XX"
1164 depends on SYS_HAS_CPU_TX49XX 1173 depends on SYS_HAS_CPU_TX49XX
1174 select CPU_HAS_PREFETCH
1165 select CPU_SUPPORTS_32BIT_KERNEL 1175 select CPU_SUPPORTS_32BIT_KERNEL
1166 select CPU_SUPPORTS_64BIT_KERNEL 1176 select CPU_SUPPORTS_64BIT_KERNEL
1167 1177
@@ -1584,7 +1594,7 @@ source "mm/Kconfig"
1584 1594
1585config SMP 1595config SMP
1586 bool "Multi-Processing support" 1596 bool "Multi-Processing support"
1587 depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP 1597 depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP
1588 ---help--- 1598 ---help---
1589 This enables support for systems with more than one CPU. If you have 1599 This enables support for systems with more than one CPU. If you have
1590 a system with only one CPU, like most personal computers, say N. If 1600 a system with only one CPU, like most personal computers, say N. If