diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 12:50:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 12:50:43 +0100 |
| commit | 90ae83f7fc32733e5829d806306c0c590f1a383f (patch) | |
| tree | 5b4cd7290c70d9899ca7caa99998395218b15cab /arch/arm/mach-u300 | |
| parent | Input: ir-keytable - fix uninitialized variable warning (diff) | |
| parent | spi/pl022: fix erroneous platform data in U300 (diff) | |
| download | linux-90ae83f7fc32733e5829d806306c0c590f1a383f.tar.xz linux-90ae83f7fc32733e5829d806306c0c590f1a383f.zip | |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/pl022: fix erroneous platform data in U300
spi: fixed odd static string conventions in core code
spi/bfin_spi: only request GPIO on first load
spi/bfin_spi: handle error/status changes after data interrupts
spi: enable spi_board_info to be registered after spi_master
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/spi.c b/arch/arm/mach-u300/spi.c index edb2c0d255c2..00869def5420 100644 --- a/arch/arm/mach-u300/spi.c +++ b/arch/arm/mach-u300/spi.c @@ -67,7 +67,7 @@ static struct spi_board_info u300_spi_devices[] = { .bus_num = 0, /* Only one bus on this chip */ .chip_select = 0, /* Means SPI_CS_HIGH, change if e.g low CS */ - .mode = SPI_MODE_1 | SPI_LSB_FIRST | SPI_LOOP, + .mode = SPI_MODE_1 | SPI_LOOP, }, #endif }; |