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.

21 files changed, 1 insertions, 198 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8bb936226dee..3d74801a4015 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -445,11 +445,6 @@ config ALPHA_EV67
           Is this a machine based on the EV67 core?  If in doubt, select N here
           and the machine will be treated as an EV6.
 
-config ALPHA_EV7
-        bool
-        depends on ALPHA_MARVEL
-        default y
-
 config ALPHA_MCPCIA
         bool
         depends on ALPHA_RAWHIDE
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index a6b7991d7fe8..d111c3e99249 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -195,12 +195,6 @@ if ARCH_AT91SAM9260
 
 comment "AT91SAM9260 Variants"
 
-config ARCH_AT91SAM9260_SAM9XE
-        bool "AT91SAM9XE"
-        help
-          Select this if you are using Atmel's AT91SAM9XE System-on-Chip.
-          They are basically AT91SAM9260s with various sizes of embedded Flash.
-
 comment "AT91SAM9260 / AT91SAM9XE Board Type"
 
 config MACH_AT91SAM9260EK
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 6c4e9aaa70c1..ef80a6546ff2 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -323,13 +323,6 @@ config NODES_SHIFT
         default "1"
         depends on NEED_MULTIPLE_NODES
 
-# turning this on wastes a bunch of space.
-# Summit needs it only when NUMA is on
-config BOOT_IOREMAP
-        bool
-        depends on NUMA
-        default n
-
 endmenu
 
 
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.
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 9460e1c266dd..e518a5a4cf4c 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -19,9 +19,6 @@ config OPENRISC
 config MMU
         def_bool y
 
-config WISHBONE_BUS_BIG_ENDIAN
-        def_bool y
-
 config SYMBOL_PREFIX
         string
         default ""
@@ -160,15 +157,6 @@ config JUMP_UPON_UNHANDLED_EXCEPTION
 
           Say Y if you are unsure.
 
-config OPENRISC_EXCEPTION_DEBUG
-        bool "Print processor state at each exception"
-        default n
-        help
-          This option will make your kernel unusable for all but kernel
-          debugging.
-
-          Say N if you are unsure.
-
 config OPENRISC_ESR_EXCEPTION_BUG_CHECK
         bool "Check for possible ESR exception bug"
         default n
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 85195e48a9e6..b177caa56d95 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -379,10 +379,6 @@ config PHYP_DUMP
 
           If unsure, say "N"
 
-config PPCBUG_NVRAM
-        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
-        default y if PPC_PREP