Merge remote-tracking branch 'spi/topic/davinci' into spi-next

f24b19cb · Mark Brown · 8f737d61 · 32ea3944 · f24b19cb
Commit f24b19cb authored Oct 25, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/spi/spi-davinci.c drivers/spi/spi-davinci.c +2 -1

No files found.
--- 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;