diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/spi/spi_gpio.c | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/spi/spi_gpio.c')
| -rw-r--r-- | drivers/spi/spi_gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c index 26bd03e61855..7edbd5807e0e 100644 --- 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) | |||
| 127 | */ | 127 | */ |
| 128 | #define spidelay(nsecs) do {} while (0) | 128 | #define spidelay(nsecs) do {} while (0) |
| 129 | 129 | ||
| 130 | #define EXPAND_BITBANG_TXRX | 130 | #include "spi_bitbang_txrx.h" |
| 131 | #include <linux/spi/spi_bitbang.h> | ||
| 132 | 131 | ||
| 133 | /* | 132 | /* |
| 134 | * These functions can leverage inline expansion of GPIO calls to shrink | 133 | * These functions can leverage inline expansion of GPIO calls to shrink |