diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/spi/dw_spi.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/spi/dw_spi.h')
| -rw-r--r-- | drivers/spi/dw_spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/dw_spi.h b/drivers/spi/dw_spi.h index fb0bce564844..b23e452adaf7 100644 --- a/drivers/spi/dw_spi.h +++ b/drivers/spi/dw_spi.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #define SPI_INT_RXFI (1 << 4) | 46 | #define SPI_INT_RXFI (1 << 4) |
| 47 | #define SPI_INT_MSTI (1 << 5) | 47 | #define SPI_INT_MSTI (1 << 5) |
| 48 | 48 | ||
| 49 | /* TX RX interrupt level threshhold, max can be 256 */ | 49 | /* TX RX interrupt level threshold, max can be 256 */ |
| 50 | #define SPI_INT_THRESHOLD 32 | 50 | #define SPI_INT_THRESHOLD 32 |
| 51 | 51 | ||
| 52 | enum dw_ssi_type { | 52 | enum dw_ssi_type { |