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_butterfly.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_butterfly.c')
| -rw-r--r-- | drivers/spi/spi_butterfly.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c index c2184866fa9c..8b5281281111 100644 --- a/drivers/spi/spi_butterfly.c +++ b/drivers/spi/spi_butterfly.c | |||
| @@ -149,8 +149,7 @@ static void butterfly_chipselect(struct spi_device *spi, int value) | |||
| 149 | #define spidelay(X) do{}while(0) | 149 | #define spidelay(X) do{}while(0) |
| 150 | //#define spidelay ndelay | 150 | //#define spidelay ndelay |
| 151 | 151 | ||
| 152 | #define EXPAND_BITBANG_TXRX | 152 | #include "spi_bitbang_txrx.h" |
| 153 | #include <linux/spi/spi_bitbang.h> | ||
| 154 | 153 | ||
| 155 | static u32 | 154 | static u32 |
| 156 | butterfly_txrx_word_mode0(struct spi_device *spi, | 155 | butterfly_txrx_word_mode0(struct spi_device *spi, |