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
-
 config IRQ_ALL_CPUS
         bool "Distribute interrupts on all CPUs by default"
         depends on SMP && !MV64360
@@ -745,24 +741,6 @@ config 8260_PCI9
         depends on PCI_8260 && !8272
         default y
 
-choice
-        prompt "IDMA channel for PCI 9 workaround"
-        depends on 8260_PCI9
-
-config 8260_PCI9_IDMA1
-        bool "IDMA1"
-
-config 8260_PCI9_IDMA2
-        bool "IDMA2"
-
-config 8260_PCI9_IDMA3
-        bool "IDMA3"
-
-config 8260_PCI9_IDMA4
-        bool "IDMA4"
-
-endchoice
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 8f9c3e245cff..153022971daa 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -107,11 +107,6 @@ config PPC40x_SIMPLE
         help
           This option enables the simple PowerPC 40x platform support.
 
-# 40x specific CPU modules, selected based on the board above.
-config NP405H
-        bool
-        #depends on ASH
-
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index a85990c886e9..fbecae0fbb49 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -284,14 +284,6 @@ config PPC_MMU_NOHASH
         def_bool y
         depends on !PPC_STD_MMU
 
-config PPC_MMU_NOHASH_32
-        def_bool y
-        depends on PPC_MMU_NOHASH && PPC32
-
-config PPC_MMU_NOHASH_64
-        def_bool y
-        depends on PPC_MMU_NOHASH && PPC64
-
 config PPC_BOOK3E_MMU
         def_bool y
         depends on FSL_BOOKE || PPC_BOOK3E
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 524d971a1478..5a8f50a9afa7 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -87,10 +87,6 @@ config MV64X60
 config MPC10X_OPENPIC
         bool
 
-config MPC10X_STORE_GATHERING
-        bool "Enable MPC10x store gathering"
-        depends on MPC10X_BRIDGE
-
 config GAMECUBE_COMMON
         bool
 
diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig
index f0536c7cda9f..1547f66235d9 100644
--- a/arch/powerpc/platforms/prep/Kconfig
+++ b/arch/powerpc/platforms/prep/Kconfig
@@ -21,12 +21,3 @@ config PREP_RESIDUAL
           or pass the 'noresidual' option to the kernel.
 
           If you are running a PReP system, say Y here, otherwise say N.
-
-config PROC_PREPRESIDUAL
-        bool "Support for reading of PReP Residual Data in /proc"
-        depends on PREP_RESIDUAL && PROC_FS
-        help
-          Enabling this option will create a /proc/residual file which allows
-          you to get at the residual data on PReP systems.  You will need a tool
-          (lsresidual) to parse it.  If you aren't on a PReP system, you don't
-          want this.
diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
index f4fb837873fb..bd560c786ed6 100644
--- a/arch/powerpc/platforms/wsp/Kconfig
+++ b/arch/powerpc/platforms/wsp/Kconfig
@@ -24,8 +24,3 @@ endmenu
 config PPC_A2_DD2
         bool "Support for DD2 based A2/WSP systems"
         depends on PPC_A2
-
-config WORKAROUND_ERRATUM_463
-        depends on PPC_A2_DD2
-        bool "Workaround erratum 463"
-        default y
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 288add8d168f..df169e84db4e 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -52,16 +52,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_CLOCKEVENTS
         def_bool y
 
-config SCHED_NO_NO_OMIT_FRAME_POINTER
-        def_bool y
-
-config GENERIC_SYSCALL_TABLE
-        def_bool y
-
-config SCORE_L1_CACHE_SHIFT
-        int
-        default "4"
-
 menu "Kernel type"
 
 config 32BIT
@@ -96,15 +86,6 @@ config STACKTRACE_SUPPORT
 
 source "init/Kconfig"
 
-config PROBE_INITRD_HEADER
-        bool "Probe initrd header created by addinitrd"
-        depends on BLK_DEV_INITRD
-        help
-          Probe initrd header at the last page of kernel image.
-          Say Y here if you are using arch/score/boot/addinitrd.c to
-          add initrd or initramfs image to the kernel image.
-          Otherwise, say N.
-
 config MMU
         def_bool y
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 1a6f20d4e7e6..f92602e86607 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -560,12 +560,7 @@ config SUN_OPENPROMFS
           Only choose N if you know in advance that you will not need to modify
           OpenPROM settings on the running system.
 
-# Makefile helpers
-config SPARC32_PCI
-        bool
-        default y
-        depends on SPARC32 && PCI
-
+# Makefile helper
 config SPARC64_PCI
         bool
         default y
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 77f7a384c0b5..cb9a1044a771 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -194,9 +194,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
 config NEED_PER_CPU_PAGE_FIRST_CHUNK
         def_bool y
 
-config HAVE_CPUMASK_OF_CPU_MAP
-        def_bool X86_64_SMP
-
 config ARCH_HIBERNATION_POSSIBLE
         def_bool y
 
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 21bebe63df66..1d97bd84b6fb 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -57,9 +57,6 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
         def_bool !64BIT
 
-config SMP_BROKEN
-        def_bool 64BIT
-
 config GENERIC_HWEIGHT
         def_bool y
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index ac6f190743dd..22745d7bf530 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -29,15 +29,6 @@ config STMMAC_DA
           By default, the DMA arbitration scheme is based on Round-robin
           (rx:tx priority is 1:1).
 
-config STMMAC_DUAL_MAC
-        bool "STMMAC: dual mac support (EXPERIMENTAL)"
-        default n
-        depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
-        ---help---
-          Some ST SoCs (for example the stx7141 and stx7200c2) have two
-          Ethernet Controllers. This option turns on the second Ethernet
-          device on this kind of platforms.
-
 config STMMAC_TIMER
         bool "STMMAC Timer optimisation"
         default n
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index cec66064ee4b..b6f9749b4fa7 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -51,17 +51,6 @@ config XEN_PCIDEV_FRONTEND
           The PCI device frontend driver allows the kernel to import arbitrary
           PCI devices from a PCI backend to support PCI driver domains.
 
-config XEN_PCIDEV_FE_DEBUG
-        bool "Xen PCI Frontend debugging"
-        depends on XEN_PCIDEV_FRONTEND && PCI_DEBUG
-        help
-          Say Y here if you want the Xen PCI frontend to produce a bunch of debug
-          messages to the system log.  Select this if you are having a
-          problem with Xen PCI frontend support and want to see more of what is
-          going on.
-
-          When in doubt, say N.
-
 config HT_IRQ
         bool "Interrupts on hypertransport devices"
         default y
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index aa573c39f596..06ea3bcfdd2a 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -617,20 +617,6 @@ config SCSI_ARCMSR
           To compile this driver as a module, choose M here: the
           module will be called arcmsr (modprobe arcmsr).
 
-config SCSI_ARCMSR_AER
-        bool "Enable PCI Error Recovery Capability in Areca Driver(ARCMSR)"
-        depends on SCSI_ARCMSR && PCIEAER
-        default n
-        help
-          The advanced error reporting(AER) capability is "NOT" provided by
-          ARC1200/1201/1202 SATA RAID controllers cards.
-          If your card is one of ARC1200/1201/1202, please use the default setting, n.
-          If your card is other models, you could pick it
-          on condition that the kernel version is greater than 2.6.19.
-          This function is maintained driver by Nick Cheng. If you have any
-          problems or suggestion, you are welcome to contact with <nick.cheng@areca.com.tw>.
-          To enable this function, choose Y here.
-
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 source "drivers/scsi/mpt2sas/Kconfig"
 
diff --git a/samples/Kconfig b/samples/Kconfig
index 96a7572853f7..41063e7592d2 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -61,10 +61,4 @@ config SAMPLE_KDB
           Build an example of how to dynamically add the hello
           command to the kdb shell.
 
-config SAMPLE_HIDRAW
-        bool "Build simple hidraw example"
-        depends on HIDRAW && HEADERS_CHECK
-        help
-          Build an example of how to use hidraw from userspace.
-
 endif # SAMPLES