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

6e693ff1 · Mark Brown · 23e0ad77 · ecc77773 · 6e693ff1
Commit 6e693ff1 authored Oct 25, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/spi/spi-gpio.c drivers/spi/spi-gpio.c +1 -0

No files found.
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>