summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:49:18 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:49:18 +0100
commit578739259875a93b1869d25cdf4a8bd963b7d0a7 (patch)
tree37d101ce0e82405b271a37d43db0f8f3780b0d97 /drivers/spi
parent961722f57c5e130a500eb1b44b4b97cc91bd7eeb (diff)
parente221fa40a4b6e42c226fd1e0b9d9e03ef2f5cb54 (diff)
downloadop-kernel-dev-578739259875a93b1869d25cdf4a8bd963b7d0a7.zip
op-kernel-dev-578739259875a93b1869d25cdf4a8bd963b7d0a7.tar.gz
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-txx9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index e9b7681..7c6d157 100644
--- 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
OpenPOWER on IntegriCloud