Merge remote-tracking branch 'spi/fix/dspi' into spi-linus

[deliverable/linux.git] / drivers / mfd / wm831x-spi.c

diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index e7ed14f661d8eb1360d7974ae0bf64ec90ea0401..07de3cc5a0d91db385a8ef755e8bf89d3817477b 100644 (file)
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -34,7 +34,6 @@ static int wm831x_spi_probe(struct spi_device *spi)
        if (wm831x == NULL)
                return -ENOMEM;
 
-       spi->bits_per_word = 16;
        spi->mode = SPI_MODE_0;
 
        spi_set_drvdata(spi, wm831x);