diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 11:14:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 11:14:49 -0700 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/spi/spi_fsl_espi.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
download | lwn-42933bac11e811f02200c944d8562a15f8ec4ff0.tar.gz lwn-42933bac11e811f02200c944d8562a15f8ec4ff0.zip |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/spi/spi_fsl_espi.c')
-rw-r--r-- | drivers/spi/spi_fsl_espi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_fsl_espi.c b/drivers/spi/spi_fsl_espi.c index 900e921ab80e..496f895a0024 100644 --- a/drivers/spi/spi_fsl_espi.c +++ b/drivers/spi/spi_fsl_espi.c @@ -474,7 +474,7 @@ static int fsl_espi_setup(struct spi_device *spi) mpc8xxx_spi = spi_master_get_devdata(spi->master); reg_base = mpc8xxx_spi->reg_base; - hw_mode = cs->hw_mode; /* Save orginal settings */ + hw_mode = cs->hw_mode; /* Save original settings */ cs->hw_mode = mpc8xxx_spi_read_reg( ®_base->csmode[spi->chip_select]); /* mask out bits we are going to set */ |