diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:54:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:54:53 -0800 |
| commit | 02ebbbd481635fd3ce7018e5bb19c18c0f1e4561 (patch) | |
| tree | f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a /arch/mips | |
| parent | addd8c92cf55bba578b8a56e0f717a0a74b31008 (diff) | |
| parent | 536ec4f8d13433126f948d6e90821f811a4ebdf8 (diff) | |
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scsi: drop unused Kconfig symbol
pci: drop unused Kconfig symbol
stmmac: drop unused Kconfig symbol
x86: drop unused Kconfig symbol
powerpc: drop unused Kconfig symbols
powerpc: 40x: drop unused Kconfig symbol
mips: drop unused Kconfig symbols
openrisc: drop unused Kconfig symbols
arm: at91: drop unused Kconfig symbol
samples: drop unused Kconfig symbol
m32r: drop unused Kconfig symbol
score: drop unused Kconfig symbols
sh: drop unused Kconfig symbol
um: drop unused Kconfig symbol
sparc: drop unused Kconfig symbol
alpha: drop unused Kconfig symbol
Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
should be deleted.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 14 | ||||
| -rw-r--r-- | arch/mips/powertv/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/powertv/asic/Kconfig | 28 |
3 files changed, 0 insertions, 44 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 62b9677c39a1..d46f1da18a3c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -820,10 +820,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config ARCH_SUPPORTS_OPROFILE - bool - default y if !MIPS_MT_SMTC - config GENERIC_HWEIGHT bool default y @@ -2255,16 +2251,6 @@ config HZ source "kernel/Kconfig.preempt" -config MIPS_INSANE_LARGE - bool "Support for large 64-bit configurations" - depends on CPU_R10000 && 64BIT - help - MIPS R10000 does support a 44 bit / 16TB address space as opposed to - previous 64-bit processors which only supported 40 bit / 1TB. If you - need processes of more than 1TB virtual address space, say Y here. - This will result in additional memory usage, so it is not - recommended for normal users. - config KEXEC bool "Kexec system call (EXPERIMENTAL)" 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 @@ -source "arch/mips/powertv/asic/Kconfig" - config BOOTLOADER_DRIVER bool "PowerTV Bootloader Driver Support" 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 @@ -config MIN_RUNTIME_RESOURCES - bool "Support for minimum runtime resources" - default n - depends on POWERTV - help - Enables support for minimizing the number of (SA asic) runtime - resources that are preallocated by the kernel. - -config MIN_RUNTIME_DOCSIS - bool "Support for minimum DOCSIS resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated DOCSIS resource. - -config MIN_RUNTIME_PMEM - bool "Support for minimum PMEM resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated Memory resource. - -config MIN_RUNTIME_TFTP - bool "Support for minimum TFTP resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated TFTP resource. |