Auto-update from upstream

2005-10-28 12:18:07 -04:00
parent e0f998930e 260b23674f
commit 210cc679fa
268 changed files with 4957 additions and 2840 deletions
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1024,7 +1024,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
 * See Documentation/DMA-mapping.txt
 */
 static void *sba_alloc_consistent(struct device *hwdev, size_t size,
-					dma_addr_t *dma_handle, int gfp)
+					dma_addr_t *dma_handle, gfp_t gfp)
 {
 	void *ret;