From 3d79751fd85bc9f67702ade2f23b01aa07208b05 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@vmware.com>
Date: Tue, 19 Jan 2010 10:24:40 -0800
Subject: [PATCH] --- yaml --- r: 181292 b: refs/heads/master c:
 d0e2ddff7c4b493acff50a9000564b67cbe7d676 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 36f4ab6f2485..776c685bc4a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa4698fcf59c3bd01c171e5e558bae9e8eb396f1
+refs/heads/master: d0e2ddff7c4b493acff50a9000564b67cbe7d676
diff --git a/trunk/drivers/scsi/vmw_pvscsi.c b/trunk/drivers/scsi/vmw_pvscsi.c
index d2604c813a20..e4ac5829b637 100644
--- a/trunk/drivers/scsi/vmw_pvscsi.c
+++ b/trunk/drivers/scsi/vmw_pvscsi.c
@@ -1069,7 +1069,8 @@ static void pvscsi_free_sgls(const struct pvscsi_adapter *adapter)
 		free_pages((unsigned long)ctx->sgl, get_order(SGL_SIZE));
 }
 
-static int pvscsi_setup_msix(const struct pvscsi_adapter *adapter, int *irq)
+static int pvscsi_setup_msix(const struct pvscsi_adapter *adapter,
+			     unsigned int *irq)
 {
 	struct msix_entry entry = { 0, PVSCSI_VECTOR_COMPLETION };
 	int ret;