diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /drivers/scsi/scsi_transport_iscsi.c | |
parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
download | linux-next-aaadff81195056c7c14e0d834b3318c624c0fd78.tar.gz |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 49fd18c1a9c6..e08462d50c97 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -249,7 +249,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; |