Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / drivers / scsi / vmw_pvscsi.c

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index d2604c8..2689445 100644 (file)
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
 
@@ -1069,7 +1070,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;