Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/bcm63xx', 'spi/topic...

diff --combined drivers/spi/Kconfig
index 26b860534fa7dbc13a69cd76351a30584a993584,4887f317ea58f7c5566fcb1481559831b7f81180,5c1db987beffc9917163ba5fc8b7c30c9e8cfc8a,4887f317ea58f7c5566fcb1481559831b7f81180,4887f317ea58f7c5566fcb1481559831b7f81180,4887f317ea58f7c5566fcb1481559831b7f81180..cac92245e3ef8d5528dc7ab7cbedbe7fecc524b4
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -88,17 -88,6 -88,6 -88,6 -88,6 -88,6 +88,17 @@@@@@@ config SPI_BCM283
          is for the regular SPI controller. Slave mode operation is not also
          not supported.
      
 +++++config SPI_BCM2835AUX
 +++++  tristate "BCM2835 SPI auxiliary controller"
 +++++  depends on ARCH_BCM2835 || COMPILE_TEST
 +++++  depends on GPIOLIB
 +++++  help
 +++++    This selects a driver for the Broadcom BCM2835 SPI aux master.
 +++++
 +++++    The BCM2835 contains two types of SPI master controller; the
 +++++    "universal SPI master", and the regular SPI controller.
 +++++    This driver is for the universal/auxiliary SPI controller.
 +++++
      config SPI_BFIN5XX
        tristate "SPI controller driver for ADI Blackfin5xx"
        depends on BLACKFIN && !BF60x
@@@@@@@ -136,7 -125,7 -125,7 -125,7 -125,7 -125,7 +136,7 @@@@@@@ config SPI_BCM53X
      
      config SPI_BCM63XX
        tristate "Broadcom BCM63xx SPI controller"
-- ---  depends on BCM63XX
++ +++  depends on BCM63XX || COMPILE_TEST
        help
                Enable support for the SPI controller on the Broadcom BCM63xx SoCs.