diff --git a/[refs] b/[refs]
index b9455e55ec78..459ebaec9187 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a7b75ae719754c77ccd4d18b0d258ae5db38a25
+refs/heads/master: 255f6386b816b2bc0c251af0ee4985ad5a8461b7
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 479af9352a42..3ab08f8dfb25 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -1874,23 +1874,6 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)
 	fc_fcp_pkt_release(fsp);
 }
 
-/**
- * fc_fcp_complete() - complete processing of a fcp packet
- * @fsp:	fcp packet
- *
- * This function may sleep if a fsp timer is pending.
- * The host lock must not be held by caller.
- */
-void fc_fcp_complete(struct fc_fcp_pkt *fsp)
-{
-	if (fc_fcp_lock_pkt(fsp))
-		return;
-
-	fc_fcp_complete_locked(fsp);
-	fc_fcp_unlock_pkt(fsp);
-}
-EXPORT_SYMBOL(fc_fcp_complete);
-
 /**
  * fc_eh_abort() - Abort a command
  * @sc_cmd:	scsi command to abort
diff --git a/trunk/include/scsi/libfc.h b/trunk/include/scsi/libfc.h
index f207b6cac06f..db2175da2da5 100644
--- a/trunk/include/scsi/libfc.h
+++ b/trunk/include/scsi/libfc.h
@@ -887,14 +887,6 @@ int fc_fcp_init(struct fc_lport *);
 int fc_queuecommand(struct scsi_cmnd *sc_cmd,
 		    void (*done)(struct scsi_cmnd *));
 
-/*
- * complete processing of a fcp packet
- *
- * This function may sleep if a fsp timer is pending.
- * The host lock must not be held by caller.
- */
-void fc_fcp_complete(struct fc_fcp_pkt *fsp);
-
 /*
  * Send an ABTS frame to the target device. The sc_cmd argument
  * is a pointer to the SCSI command to be aborted.