aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/mthca/mthca_cmd.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-10-28 18:50:51 -0400
committerRoland Dreier <rolandd@cisco.com>2005-10-28 18:50:51 -0400
commita4da0628efd788eb199dd9df225e296035ec2539 (patch)
tree1e611030c993e1480dc2f07f26976d2d33002b0d /drivers/infiniband/hw/mthca/mthca_cmd.c
parent70a30e16a8a9d22396a4d1e96af86e43594df584 (diff)
parent20731945ae743034353a88c307920d1f16cf8ac8 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_cmd.c')
-rw-r--r--drivers/infiniband/hw/mthca/mthca_cmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 9220473dbfbd..49f211d55df7 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -525,7 +525,7 @@ void mthca_cmd_use_polling(struct mthca_dev *dev)
525} 525}
526 526
527struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev, 527struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
528 unsigned int gfp_mask) 528 gfp_t gfp_mask)
529{ 529{
530 struct mthca_mailbox *mailbox; 530 struct mthca_mailbox *mailbox;
531 531