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

Mark Brown
2 parents 961722f57c e221fa40a4
Showing 1 changed file Side-by-side Diff
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