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

5d6ada67 · Mark Brown · 5bfb10d7 · 29ad1a7a · 5d6ada67 · 5d6ada67
Commit 5d6ada67 authored Jun 18, 2015 by Mark Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 354 additions and 39 deletions

drivers/spi/Kconfig drivers/spi/Kconfig +1 -0

drivers/spi/spi-bcm2835.c drivers/spi/spi-bcm2835.c +353 -39

No files found.
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -77,6 +77,7 @@ config SPI_ATMEL

 config SPI_BCM2835
 	tristate "BCM2835 SPI controller"
+	depends on GPIOLIB
 	depends on ARCH_BCM2835 || COMPILE_TEST
 	depends on GPIOLIB
 	help

--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c