From bb4d1b62099167a84847d853346adb796b40349f Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Wed, 1 Feb 2006 21:07:11 -0600
Subject: [PATCH] --- yaml --- r: 20381 b: refs/heads/master c:
 28e5554df63085be3b8bd2aee6ddbc479f0d136e h: refs/heads/master i:   20379:
 6a9d75bf44d8dfb0e6406a8d7344698f7c276a05 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/scsi/scsi_transport_iscsi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3a474e4af295..aa22250625ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36ae07cb7757bd3eabd13c79844083dccac2f77
+refs/heads/master: 28e5554df63085be3b8bd2aee6ddbc479f0d136e
diff --git a/trunk/drivers/scsi/scsi_transport_iscsi.c b/trunk/drivers/scsi/scsi_transport_iscsi.c
index 7fb69183c72d..55860d26f999 100644
--- a/trunk/drivers/scsi/scsi_transport_iscsi.c
+++ b/trunk/drivers/scsi/scsi_transport_iscsi.c
@@ -489,7 +489,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
 	struct mempool_zone *zone = pool_data;