diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /include/linux/spi/spi.h | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/spi/spi.h')
| -rw-r--r-- | include/linux/spi/spi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 82229317753d..68bb1c501d0d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
| @@ -327,9 +327,9 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); | |||
| 327 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped | 327 | * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped |
| 328 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped | 328 | * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped |
| 329 | * @len: size of rx and tx buffers (in bytes) | 329 | * @len: size of rx and tx buffers (in bytes) |
| 330 | * @speed_hz: Select a speed other then the device default for this | 330 | * @speed_hz: Select a speed other than the device default for this |
| 331 | * transfer. If 0 the default (from @spi_device) is used. | 331 | * transfer. If 0 the default (from @spi_device) is used. |
| 332 | * @bits_per_word: select a bits_per_word other then the device default | 332 | * @bits_per_word: select a bits_per_word other than the device default |
| 333 | * for this transfer. If 0 the default (from @spi_device) is used. | 333 | * for this transfer. If 0 the default (from @spi_device) is used. |
| 334 | * @cs_change: affects chipselect after this transfer completes | 334 | * @cs_change: affects chipselect after this transfer completes |
| 335 | * @delay_usecs: microseconds to delay after this transfer before | 335 | * @delay_usecs: microseconds to delay after this transfer before |