diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:58 -0400 |
commit | 9020b75467ff81b2ae257bbf19acff462854d4ab (patch) | |
tree | 42345d07017a00013edd4ee36d718776ee5ceb22 /include/linux/spi | |
parent | 84c86edab3a37f5f650d0b3bb0f9803f9fbf2a8b (diff) | |
parent | 078726ce6d56a767533064e0f2f2100d7cb6fc22 (diff) |
Merge remote-tracking branch 'spi/topic/msglen' into spi-next
Diffstat (limited to 'include/linux/spi')
-rw-r--r-- | include/linux/spi/spi.h | 1 |
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 { | |||
584 | /* completion is reported through a callback */ | 584 | /* completion is reported through a callback */ |
585 | void (*complete)(void *context); | 585 | void (*complete)(void *context); |
586 | void *context; | 586 | void *context; |
587 | unsigned frame_length; | ||
587 | unsigned actual_length; | 588 | unsigned actual_length; |
588 | int status; | 589 | int status; |
589 | 590 | ||