diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
| commit | bebcb8dab6bac53b6a61a896db03781d1992cadb (patch) | |
| tree | 4793b0c2e913db8cf573ee52d568471603273af6 /include/linux/spi/spi.h | |
| parent | 26c21dd9885a2d8a4f4d539917c4877ffd399286 (diff) | |
| parent | f1e0bb0ad473a32d1b7e6d285ae9f7e47710bb5e (diff) | |
Merge branch 'irq/for-arm' into irq/core
Bring in the change which we offered arm[64] folks to pull into their
trees.
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 |