diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:28 +0100 |
| commit | 04877397afbdfeda4e073be710ce3f79f2912f16 (patch) | |
| tree | e97db44d25953bf8626e106006caf6f7873b3cbe /include | |
| parent | 0b1107b29b1c7c96ce5b2cae4115e336dbdfe8e7 (diff) | |
| parent | f813175aa54367f455d8bb96f8f5ac2cec924528 (diff) | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/atmel-ssc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h index deb0ae58b99b..66a0e5384edd 100644 --- a/include/linux/atmel-ssc.h +++ b/include/linux/atmel-ssc.h @@ -11,7 +11,7 @@ struct atmel_ssc_platform_data { struct ssc_device { struct list_head list; - resource_size_t phybase; + dma_addr_t phybase; void __iomem *regs; struct platform_device *pdev; struct atmel_ssc_platform_data *pdata; |