From: Mark Brown <broonie@kernel.org>
Date: Wed, 17 Jun 2015 23:19:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
X-Git-Tag: firefly_0821_release~176^2~1599^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d6ada671b01acfb2d6c5c9968babc0621bfe7e7;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
---

5d6ada671b01acfb2d6c5c9968babc0621bfe7e7
diff --cc drivers/spi/Kconfig
index 72b059081559,d5ed2a086c5e..4392db2d28ca
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -77,8 -77,8 +77,9 @@@ config SPI_ATME
  
  config SPI_BCM2835
  	tristate "BCM2835 SPI controller"
+ 	depends on GPIOLIB
  	depends on ARCH_BCM2835 || COMPILE_TEST
 +	depends on GPIOLIB
  	help
  	  This selects a driver for the Broadcom BCM2835 SPI master.