Merge branch 'master'

[sfrench/cifs-2.6.git] / include / linux / idr.h

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 3d5de45f961b050d9780795c0bb07a34c866911c..7fb3ff9c7b0e4763b15b3ebf1aad0148a64f8e00 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -71,7 +71,7 @@ struct idr {
  */
 
 void *idr_find(struct idr *idp, int id);
-int idr_pre_get(struct idr *idp, unsigned gfp_mask);
+int idr_pre_get(struct idr *idp, gfp_t gfp_mask);
 int idr_get_new(struct idr *idp, void *ptr, int *id);
 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
 void idr_remove(struct idr *idp, int id);