diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /drivers/scsi/iscsi_tcp.c | |
parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
download | kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.zip kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.tar.gz kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.tar.bz2 |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/iscsi_tcp.c')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 4fea3e4..3d8009f 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -3368,7 +3368,7 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param, switch(param) { case ISCSI_PARAM_MAX_RECV_DLENGTH: { char *saveptr = conn->data; - int flags = GFP_KERNEL; + gfp_t flags = GFP_KERNEL; if (conn->data_size >= value) { conn->max_recv_dlength = value; |