diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/spi/spi_fsl_espi.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 900e921ab80..496f895a002 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) | |||
| 474 | mpc8xxx_spi = spi_master_get_devdata(spi->master); | 474 | mpc8xxx_spi = spi_master_get_devdata(spi->master); |
| 475 | reg_base = mpc8xxx_spi->reg_base; | 475 | reg_base = mpc8xxx_spi->reg_base; |
| 476 | 476 | ||
| 477 | hw_mode = cs->hw_mode; /* Save orginal settings */ | 477 | hw_mode = cs->hw_mode; /* Save original settings */ |
| 478 | cs->hw_mode = mpc8xxx_spi_read_reg( | 478 | cs->hw_mode = mpc8xxx_spi_read_reg( |
| 479 | ®_base->csmode[spi->chip_select]); | 479 | ®_base->csmode[spi->chip_select]); |
| 480 | /* mask out bits we are going to set */ | 480 | /* mask out bits we are going to set */ |