diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:52:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:52:30 -0700 |
| commit | 84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5 (patch) | |
| tree | cd2e0ccf78d2226fcc969539594d392088dddac9 /include/linux | |
| parent | 9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44 (diff) | |
| parent | 2431a8154634027ce3915200699f26fb3725a1f2 (diff) | |
| download | linux-3.10-84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5.tar.gz linux-3.10-84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5.tar.bz2 linux-3.10-84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5.zip | |
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull misc SPI device driver bug fixes from Grant Likely.
* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
spi/spi-bfin5xx: Fix flush of last bit after each spi transfer
spi/spi-bfin5xx: fix reversed if condition in interrupt mode
spi/spi_bfin_sport: drop bits_per_word from client data
spi/bfin_spi: drop bits_per_word from client data
spi/spi-bfin-sport: move word length setup to transfer handler
spi/bfin5xx: rename config macro name for bfin5xx spi controller driver
spi/pl022: Allow request for higher frequency than maximum possible
spi/bcm63xx: set master driver mode_bits.
spi/bcm63xx: don't use the stopping state
spi/bcm63xx: convert to the pump message infrastructure
spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction
spi: fix spi.h kernel-doc warning
spi/pl022: Fix calculate_effective_freq()
spi/pl022: Fix range checking for bits per word
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 98679b061b6..fa702aeb503 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -254,7 +254,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) * driver is finished with this message, it must call * spi_finalize_current_message() so the subsystem can issue the next * transfer - * @prepare_transfer_hardware: there are currently no more messages on the + * @unprepare_transfer_hardware: there are currently no more messages on the * queue so the subsystem notifies the driver that it may relax the * hardware by issuing this call * |