Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index 0775fdee5fa8..f4776451a754 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -158,10 +158,16 @@ static int iseriesvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
                                              0);
 }
 
+static int iseriesvscsi_resume(struct ibmvscsi_host_data *hostdata)
+{
+        return 0;
+}
+
 struct ibmvscsi_ops iseriesvscsi_ops = {
         .init_crq_queue = iseriesvscsi_init_crq_queue,
         .release_crq_queue = iseriesvscsi_release_crq_queue,
         .reset_crq_queue = iseriesvscsi_reset_crq_queue,
         .reenable_crq_queue = iseriesvscsi_reenable_crq_queue,
         .send_crq = iseriesvscsi_send_crq,
+        .resume = iseriesvscsi_resume,
 };