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.

3 files changed, 0 insertions, 34 deletions

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"