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/dw_spi.h | |
| 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/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 fb0bce56484..b23e452adaf 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 { |