diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:25 +0100 |
| commit | f24b19cb777bb48e80f3255aa8085410a2fc4cb6 (patch) | |
| tree | ad6b9bfe7c01b0e748c6b5eede595f6795894e23 /drivers/spi | |
| parent | 8f737d6185e010769f144418edb3d10fca05b2ba (diff) | |
| parent | 32ea3944436ca9e73677f9d844289780f255d45a (diff) | |
| download | linux-f24b19cb777bb48e80f3255aa8085410a2fc4cb6.tar.bz2 | |
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index af2bb73d0168..dd72445ba2ea 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -279,7 +279,8 @@ static int davinci_spi_setup_transfer(struct spi_device *spi, struct davinci_spi *dspi; struct davinci_spi_config *spicfg; u8 bits_per_word = 0; - u32 hz = 0, spifmt = 0, prescale = 0; + u32 hz = 0, spifmt = 0; + int prescale; dspi = spi_master_get_devdata(spi->master); spicfg = (struct davinci_spi_config *)spi->controller_data; |