git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
drivers
/
spi
/
spi_gpio.c
diff --git
a/drivers/spi/spi_gpio.c
b/drivers/spi/spi_gpio.c
index
26bd03e
..
7edbd58
100644
(file)
--- a/
drivers/spi/spi_gpio.c
+++ b/
drivers/spi/spi_gpio.c
@@
-127,8
+127,7
@@
static inline int getmiso(const struct spi_device *spi)
*/
#define spidelay(nsecs) do {} while (0)
-#define EXPAND_BITBANG_TXRX
-#include <linux/spi/spi_bitbang.h>
+#include "spi_bitbang_txrx.h"
/*
* These functions can leverage inline expansion of GPIO calls to shrink