diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-06-02 10:02:34 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2016-06-02 10:02:34 -0700 |
| commit | 430c728373dac245d0ca55aac1d0fcc456872174 (patch) | |
| tree | 82b61d813ac0204316dd5a67c46fd40e41d63e01 /drivers/i2c/busses/i2c-cpm.c | |
| parent | 7a829b541431d70eb10d8471bc33a424da36820f (diff) | |
| parent | 351d2d4d3108a9a0f0e112dabbc36c2b1446e4f8 (diff) | |
Merge tag 'v4.4.12' into toradex_vf_4.4-next
This is the 4.4.12 stable release
Diffstat (limited to 'drivers/i2c/busses/i2c-cpm.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 714bdc837769..b167ab25310a 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -116,8 +116,8 @@ struct cpm_i2c { cbd_t __iomem *rbase; u_char *txbuf[CPM_MAXBD]; u_char *rxbuf[CPM_MAXBD]; - u32 txdma[CPM_MAXBD]; - u32 rxdma[CPM_MAXBD]; + dma_addr_t txdma[CPM_MAXBD]; + dma_addr_t rxdma[CPM_MAXBD]; }; static irqreturn_t cpm_i2c_interrupt(int irq, void *dev_id) |