diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
| commit | 35ebbae2836a361330b784706b7140c90a346a53 (patch) | |
| tree | ada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /drivers/infiniband/hw/mthca/mthca_memfree.h | |
| parent | c6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_memfree.h')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h index bafa51544aa3..29433f295253 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.h +++ b/drivers/infiniband/hw/mthca/mthca_memfree.h @@ -77,7 +77,7 @@ struct mthca_icm_iter { struct mthca_dev; struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages, - unsigned int gfp_mask); + gfp_t gfp_mask); void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm); struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev, |