Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / drivers / base / dma-contiguous.c

diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 426ba2772fe62af466e8a9fd94c83a6c7bb91648..e167a1e1bccb062efef2595fcd5299301a97df80 100644 (file)
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -187,7 +187,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
  * global one. Requires architecture specific dev_get_cma_area() helper
  * function.
  */
-struct page *dma_alloc_from_contiguous(struct device *dev, int count,
+struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,
                                       unsigned int align)
 {
        if (align > CONFIG_CMA_ALIGNMENT)