aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig14
-rw-r--r--arch/mips/powertv/Kconfig2
-rw-r--r--arch/mips/powertv/asic/Kconfig28
3 files changed, 0 insertions, 44 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 177cdaf83564..2ecf4326c19c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -820,10 +820,6 @@ config ARCH_HAS_ILOG2_U64
820 bool 820 bool
821 default n 821 default n
822 822
823config ARCH_SUPPORTS_OPROFILE
824 bool
825 default y if !MIPS_MT_SMTC
826
827config GENERIC_HWEIGHT 823config GENERIC_HWEIGHT
828 bool 824 bool
829 default y 825 default y
@@ -2252,16 +2248,6 @@ config HZ
2252 2248
2253source "kernel/Kconfig.preempt" 2249source "kernel/Kconfig.preempt"
2254 2250
2255config MIPS_INSANE_LARGE
2256 bool "Support for large 64-bit configurations"
2257 depends on CPU_R10000 && 64BIT
2258 help
2259 MIPS R10000 does support a 44 bit / 16TB address space as opposed to
2260 previous 64-bit processors which only supported 40 bit / 1TB. If you
2261 need processes of more than 1TB virtual address space, say Y here.
2262 This will result in additional memory usage, so it is not
2263 recommended for normal users.
2264
2265config KEXEC 2251config KEXEC
2266 bool "Kexec system call (EXPERIMENTAL)" 2252 bool "Kexec system call (EXPERIMENTAL)"
2267 depends on EXPERIMENTAL 2253 depends on EXPERIMENTAL
diff --git a/arch/mips/powertv/Kconfig b/arch/mips/powertv/Kconfig
index ff0e7e3e6954..1a1b03ea6398 100644
--- a/arch/mips/powertv/Kconfig
+++ b/arch/mips/powertv/Kconfig
@@ -1,5 +1,3 @@
1source "arch/mips/powertv/asic/Kconfig"
2
3config BOOTLOADER_DRIVER 1config BOOTLOADER_DRIVER
4 bool "PowerTV Bootloader Driver Support" 2 bool "PowerTV Bootloader Driver Support"
5 default n 3 default n
diff --git a/arch/mips/powertv/asic/Kconfig b/arch/mips/powertv/asic/Kconfig
deleted file mode 100644
index 2016bfe94d66..000000000000
--- a/arch/mips/powertv/asic/Kconfig
+++ /dev/null
@@ -1,28 +0,0 @@
1config MIN_RUNTIME_RESOURCES
2 bool "Support for minimum runtime resources"
3 default n
4 depends on POWERTV
5 help
6 Enables support for minimizing the number of (SA asic) runtime
7 resources that are preallocated by the kernel.
8
9config MIN_RUNTIME_DOCSIS
10 bool "Support for minimum DOCSIS resource"
11 default y
12 depends on MIN_RUNTIME_RESOURCES
13 help
14 Enables support for the preallocated DOCSIS resource.
15
16config MIN_RUNTIME_PMEM
17 bool "Support for minimum PMEM resource"
18 default y
19 depends on MIN_RUNTIME_RESOURCES
20 help
21 Enables support for the preallocated Memory resource.
22
23config MIN_RUNTIME_TFTP
24 bool "Support for minimum TFTP resource"
25 default y
26 depends on MIN_RUNTIME_RESOURCES
27 help
28 Enables support for the preallocated TFTP resource.