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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
spi
/
spi_butterfly.c
diff --git
a/drivers/spi/spi_butterfly.c
b/drivers/spi/spi_butterfly.c
index
c218486
..
8b52812
100644
(file)
--- 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)
#define spidelay(X) do{}while(0)
//#define spidelay ndelay
-#define EXPAND_BITBANG_TXRX
-#include <linux/spi/spi_bitbang.h>
+#include "spi_bitbang_txrx.h"
static u32
butterfly_txrx_word_mode0(struct spi_device *spi,