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

2013-09-01 13:49:18 +01:00 · 2013-09-01 13:49:18 +01:00 · 5787392598
parent 961722f57c e221fa40a4
commit 5787392598
1 changed files with 1 additions and 1 deletions
--- 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