diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-14 12:22:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-14 12:22:09 +0200 |
| commit | 3c729b4344456ebd520636563c854090e3dec611 (patch) | |
| tree | 6caae9f4d4c9f9ae2e033d64486649c6f603a209 /drivers/infiniband/hw/qib/qib_sdma.c | |
| parent | spi: s3c64xx: Use dmaengine_prep_slave_single() to prepare DMA transfers (diff) | |
| parent | Linux 3.11-rc5 (diff) | |
| download | linux-3c729b4344456ebd520636563c854090e3dec611.tar.xz linux-3c729b4344456ebd520636563c854090e3dec611.zip | |
Merge tag 'v3.11-rc5' into spi-s3c64xx
Linux 3.11-rc5
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_sdma.c b/drivers/infiniband/hw/qib/qib_sdma.c index 32162d355370..9b5322d8cd5a 100644 --- a/drivers/infiniband/hw/qib/qib_sdma.c +++ b/drivers/infiniband/hw/qib/qib_sdma.c @@ -717,7 +717,7 @@ void dump_sdma_state(struct qib_pportdata *ppd) struct qib_sdma_txreq *txp, *txpnext; __le64 *descqp; u64 desc[2]; - dma_addr_t addr; + u64 addr; u16 gen, dwlen, dwoffset; u16 head, tail, cnt; |