Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a..712518d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -414,7 +414,7 @@ skip_rio:
                                    "marked OFFLINE!\n");
                                vha->flags.online = 0;
                        } else {
-                               /* Check to see if MPI timeout occured */
+                               /* Check to see if MPI timeout occurred */
                                if ((mbx & MBX_3) && (ha->flags.port0))
                                        set_bit(MPI_RESET_NEEDED,
                                            &vha->dpc_flags);