diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 16:26:17 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 16:26:17 (GMT) |
commit | 86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0 (patch) | |
tree | dadb5d86c9f05bdbfe3180c3b307630c08f721b3 /include/linux | |
parent | 3b89f56783a4ef796190ef1192c25e72e0b986b6 (diff) | |
parent | 5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc (diff) | |
download | linux-fsl-qoriq-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.tar.xz |
Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
spi.h: missing kernel-doc notation, please fix
of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
of: Fix missing includes
ata: update for of_device to platform_device replacement
microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
microblaze: Fix of/address: Merge all of the bus translation code
booting-without-of: Remove nonexistent chapters from TOC, fix numbering
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/spi/spi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index ae0a528..92e52a1 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -213,6 +213,9 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) * @dma_alignment: SPI controller constraint on DMA buffers alignment. * @mode_bits: flags understood by this controller driver * @flags: other constraints relevant to this driver + * @bus_lock_spinlock: spinlock for SPI bus locking + * @bus_lock_mutex: mutex for SPI bus locking + * @bus_lock_flag: indicates that the SPI bus is locked for exclusive use * @setup: updates the device mode and clocking records used by a * device's SPI controller; protocol code may call this. This * must fail if an unrecognized or unsupported mode is requested. |