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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
drivers
/
spi
/
omap_uwire.c
diff --git
a/drivers/spi/omap_uwire.c
b/drivers/spi/omap_uwire.c
index
aa90ddb
..
8980a56
100644
(file)
--- a/
drivers/spi/omap_uwire.c
+++ b/
drivers/spi/omap_uwire.c
@@
-514,6
+514,8
@@
static int __init uwire_probe(struct platform_device *pdev)
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+ master->flags = SPI_MASTER_HALF_DUPLEX;
+
master->bus_num = 2; /* "official" */
master->num_chipselect = 4;
master->setup = uwire_setup;