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

Intel-BMC · Oct 25, 2013 · f24b19c · f24b19c
2 parents 8f737d6 + 32ea394
commit f24b19c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;