From: Mark Brown <broonie@kernel.org>
Date: Wed, 4 Nov 2015 11:02:06 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/bcm63xx', 'spi/topic... 
X-Git-Tag: v4.4-rc1~113^2~4
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c2da04dc21e6687b6cd46a74667e08ab4f651c48?hp=-c

Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/bcm63xx', 'spi/topic/bfin-sport', 'spi/topic/bfin5xx' and 'spi/topic/bitbang' into spi-next
---

c2da04dc21e6687b6cd46a74667e08ab4f651c48
diff --combined drivers/spi/Kconfig
index 26b860534fa7,4887f317ea58,5c1db987beff,4887f317ea58,4887f317ea58,4887f317ea58..cac92245e3ef
--- a/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.