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

diff --cc drivers/spi/Kconfig
index 72b059081559356100aa68dea2c021b056b492e5,d5ed2a086c5ebd3bb34e18c6f81449e0a4cbc2da..4392db2d28caa391b68b9366964772a141828dac
--- 1/drivers/spi/Kconfig
--- 2/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.