diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 09:26:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 09:27:36 (GMT) |
| commit | 458ce2910aa83d8a2cafb489d727f7da839e73c6 (patch) | |
| tree | 28e088137eb068e5620f17eaf0ca19d1562006ed /include/net/caif/caif_spi.h | |
| parent | 69466466ce889cd2cbc8cda9ff1c6083f48cc7f9 (diff) | |
| parent | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (diff) | |
| download | linux-fsl-qoriq-458ce2910aa83d8a2cafb489d727f7da839e73c6.tar.xz | |
Merge branch 'linus' into x86/asm
Sync up the latest NMI fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/caif/caif_spi.h')
| -rw-r--r-- | include/net/caif/caif_spi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h index 87c3d11..aa6a485 100644 --- a/include/net/caif/caif_spi.h +++ b/include/net/caif/caif_spi.h @@ -55,8 +55,8 @@ struct cfspi_xfer { u16 tx_dma_len; u16 rx_dma_len; - void *va_tx; - dma_addr_t pa_tx; + void *va_tx[2]; + dma_addr_t pa_tx[2]; void *va_rx; dma_addr_t pa_rx; }; |