diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:18 +0100 |
| commit | 9270d827de92ba638048ff6fad2ba9c01a492ba8 (patch) | |
| tree | cbc586736137602b2b3c68cfce89126775a22769 /drivers/spi/spi-butterfly.c | |
| parent | 9fbeace73cb7c7b80de0411b4ba7b879a06e202d (diff) | |
| parent | 9191546f69ddefe66e46bbe9ba8d1872bc226553 (diff) | |
| download | talos-op-linux-9270d827de92ba638048ff6fad2ba9c01a492ba8.tar.gz talos-op-linux-9270d827de92ba638048ff6fad2ba9c01a492ba8.zip | |
Merge remote-tracking branch 'spi/fix/efm' into spi-linus
Diffstat (limited to 'drivers/spi/spi-butterfly.c')
| -rw-r--r-- | drivers/spi/spi-butterfly.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c index 5ed08e537433..b1ecea2d76b3 100644 --- a/drivers/spi/spi-butterfly.c +++ b/drivers/spi/spi-butterfly.c @@ -225,7 +225,7 @@ static void butterfly_attach(struct parport *p) master->bus_num = 42; master->num_chipselect = 2; - pp->bitbang.master = spi_master_get(master); + pp->bitbang.master = master; pp->bitbang.chipselect = butterfly_chipselect; pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0; |
