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

57873925 · Mark Brown · 961722f5 · e221fa40 · 57873925
Commit 57873925 authored Sep 01, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi-txx9.c drivers/spi/spi-txx9.c +1 -1

No files found.
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -26,7 +26,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>


 #define SPI_FIFO_SIZE 4