diff options
| author | Jens Axboe <axboe@fb.com> | 2015-10-09 10:40:29 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-09 10:40:29 -0600 |
| commit | 54ef2b96879334caf8803fdd93b4c556d709d6fd (patch) | |
| tree | 05cfeb36feeb4451f8f4c7069a86ae3490027daf /include/linux/spi/spi.h | |
| parent | f7e7868b4743f1cc5e59e6e0ddd3ccf9cfe53a1b (diff) | |
| parent | fd48ca384960c831d4fae4636282e422e140ca7c (diff) | |
| download | linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.gz linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.bz2 linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.zip | |
Merge branch 'for-4.4/core' into for-4.4/drivers
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/spi/spi.h')
| -rw-r--r-- | include/linux/spi/spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 269e8afd3e2a..6b00f18f5e6b 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -34,7 +34,7 @@ extern struct bus_type spi_bus_type; /** * struct spi_statistics - statistics for spi transfers - * @clock: lock protecting this structure + * @lock: lock protecting this structure * * @messages: number of spi-messages handled * @transfers: number of spi_transfers handled |