summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 16:48:58 +0400
committerMark Brown <broonie@linaro.org>2013-09-01 16:48:58 +0400
commit9020b75467ff81b2ae257bbf19acff462854d4ab (patch)
tree42345d07017a00013edd4ee36d718776ee5ceb22 /include/linux
parent84c86edab3a37f5f650d0b3bb0f9803f9fbf2a8b (diff)
parent078726ce6d56a767533064e0f2f2100d7cb6fc22 (diff)
downloadlinux-9020b75467ff81b2ae257bbf19acff462854d4ab.tar.xz
Merge remote-tracking branch 'spi/topic/msglen' into spi-next
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/spi/spi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 47854f3813d8..e1b3e69aeddc 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -584,6 +584,7 @@ struct spi_message {
/* completion is reported through a callback */
void (*complete)(void *context);
void *context;
+ unsigned frame_length;
unsigned actual_length;
int status;