diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/spi/spi-summary | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/spi/spi-summary')
| -rw-r--r-- | Documentation/spi/spi-summary | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 068732d32276..72795796b13d 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
| @@ -262,7 +262,7 @@ NON-STATIC CONFIGURATIONS | |||
| 262 | Developer boards often play by different rules than product boards, and one | 262 | Developer boards often play by different rules than product boards, and one |
| 263 | example is the potential need to hotplug SPI devices and/or controllers. | 263 | example is the potential need to hotplug SPI devices and/or controllers. |
| 264 | 264 | ||
| 265 | For those cases you might need to use use spi_busnum_to_master() to look | 265 | For those cases you might need to use spi_busnum_to_master() to look |
| 266 | up the spi bus master, and will likely need spi_new_device() to provide the | 266 | up the spi bus master, and will likely need spi_new_device() to provide the |
| 267 | board info based on the board that was hotplugged. Of course, you'd later | 267 | board info based on the board that was hotplugged. Of course, you'd later |
| 268 | call at least spi_unregister_device() when that board is removed. | 268 | call at least spi_unregister_device() when that board is removed. |
| @@ -322,7 +322,7 @@ As soon as it enters probe(), the driver may issue I/O requests to | |||
| 322 | the SPI device using "struct spi_message". When remove() returns, | 322 | the SPI device using "struct spi_message". When remove() returns, |
| 323 | the driver guarantees that it won't submit any more such messages. | 323 | the driver guarantees that it won't submit any more such messages. |
| 324 | 324 | ||
| 325 | - An spi_message is a sequence of of protocol operations, executed | 325 | - An spi_message is a sequence of protocol operations, executed |
| 326 | as one atomic sequence. SPI driver controls include: | 326 | as one atomic sequence. SPI driver controls include: |
| 327 | 327 | ||
| 328 | + when bidirectional reads and writes start ... by how its | 328 | + when bidirectional reads and writes start ... by how its |