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

[pandora-kernel.git] / drivers / net / caif / caif_spi_slave.c

diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c
index 1b9943a..e139e13 100644 (file)
--- a/drivers/net/caif/caif_spi_slave.c
+++ b/drivers/net/caif/caif_spi_slave.c
@@ -4,7 +4,6 @@
  * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
  * License terms: GNU General Public License (GPL) version 2.
  */
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -98,7 +97,7 @@ void cfspi_xfer(struct work_struct *work)
 
                        cfspi_dbg_state(cfspi, CFSPI_STATE_FETCH_PKT);
 
-                       /* Copy commited SPI frames after the SPI indication. */
+                       /* Copy committed SPI frames after the SPI indication. */
                        ptr = (u8 *) cfspi->xfer.va_tx;
                        ptr += SPI_IND_SZ;
                        len = cfspi_xmitfrm(cfspi, ptr, cfspi->tx_cpck_len);
@@ -158,7 +157,7 @@ void cfspi_xfer(struct work_struct *work)
 
                cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_ACTIVE);
 
-               /* Signal that we are ready to recieve data. */
+               /* Signal that we are ready to receive data. */
                cfspi->dev->sig_xfer(true, cfspi->dev);
 
                cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_XFER_DONE);