Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / drivers / message / fusion / mptbase.c

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ec8080c..fa15e85 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -3435,7 +3435,7 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
  *     If memory has already been allocated, the same (cached) value
  *     is returned.
  *
- *     Return 0 if successfull, or non-zero for failure
+ *     Return 0 if successful, or non-zero for failure
  **/
 int
 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size)
@@ -6932,7 +6932,7 @@ EXPORT_SYMBOL(mpt_halt_firmware);
  *     Message Unit Reset - instructs the IOC to reset the Reply Post and
  *     Free FIFO's. All the Message Frames on Reply Free FIFO are discarded.
  *     All posted buffers are freed, and event notification is turned off.
- *     IOC doesnt reply to any outstanding request. This will transfer IOC
+ *     IOC doesn't reply to any outstanding request. This will transfer IOC
  *     to READY state.
  **/
 int
@@ -7905,7 +7905,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
                    "Owner",                                    /* 15h */
                "Open Transmit DMA Abort",                      /* 16h */
                "IO Device Missing Delay Retry",                /* 17h */
-               "IO Cancelled Due to Recieve Error",            /* 18h */
+               "IO Cancelled Due to Receive Error",            /* 18h */
                NULL,                                           /* 19h */
                NULL,                                           /* 1Ah */
                NULL,                                           /* 1Bh */