---

yaml --- r: 274324 b: refs/heads/master c: 1d5b088 h: refs/heads/master v: v3
git-mirror · Oct 31, 2011 · d6ce870 · d6ce870
1 parent 204d2b8
commit d6ce870
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 45 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e65eb83a2c249a84e83828b36a9a78b364e5877
+refs/heads/master: 1d5b088114c81d2bc1beb63e1652e305389228c8
diff --git a/trunk/arch/mips/Kconfig b/trunk/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
@@ -2252,16 +2248,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/trunk/arch/mips/powertv/Kconfig b/trunk/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/trunk/arch/mips/powertv/asic/Kconfig b/trunk/arch/mips/powertv/asic/Kconfig