diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
| commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
| tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /drivers/spi/omap2_mcspi.c | |
| parent | 583af252ab07cd1e8721878463da5b7016c18fdc (diff) | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 6f86ba0175ac..969cdd2fe124 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -298,7 +298,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) | |||
| 298 | unsigned int count, c; | 298 | unsigned int count, c; |
| 299 | unsigned long base, tx_reg, rx_reg; | 299 | unsigned long base, tx_reg, rx_reg; |
| 300 | int word_len, data_type, element_count; | 300 | int word_len, data_type, element_count; |
| 301 | int elements; | 301 | int elements = 0; |
| 302 | u32 l; | 302 | u32 l; |
| 303 | u8 * rx; | 303 | u8 * rx; |
| 304 | const u8 * tx; | 304 | const u8 * tx; |