diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 1 | ||||
| -rw-r--r-- | include/linux/hrtimer.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index c66111affca9..5056cf8d935f 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -530,7 +530,6 @@ struct device_dma_parameters { | |||
| 530 | * @dma_mem: Internal for coherent mem override. | 530 | * @dma_mem: Internal for coherent mem override. |
| 531 | * @archdata: For arch-specific additions. | 531 | * @archdata: For arch-specific additions. |
| 532 | * @of_node: Associated device tree node. | 532 | * @of_node: Associated device tree node. |
| 533 | * @of_match: Matching of_device_id from driver. | ||
| 534 | * @devt: For creating the sysfs "dev". | 533 | * @devt: For creating the sysfs "dev". |
| 535 | * @devres_lock: Spinlock to protect the resource of the device. | 534 | * @devres_lock: Spinlock to protect the resource of the device. |
| 536 | * @devres_head: The resources list of the device. | 535 | * @devres_head: The resources list of the device. |
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 51932e5acf7c..fd0dc30c9f15 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
| @@ -135,6 +135,7 @@ struct hrtimer_sleeper { | |||
| 135 | * @cpu_base: per cpu clock base | 135 | * @cpu_base: per cpu clock base |
| 136 | * @index: clock type index for per_cpu support when moving a | 136 | * @index: clock type index for per_cpu support when moving a |
| 137 | * timer to a base on another cpu. | 137 | * timer to a base on another cpu. |
| 138 | * @clockid: clock id for per_cpu support | ||
| 138 | * @active: red black tree root node for the active timers | 139 | * @active: red black tree root node for the active timers |
| 139 | * @resolution: the resolution of the clock, in nanoseconds | 140 | * @resolution: the resolution of the clock, in nanoseconds |
| 140 | * @get_time: function to retrieve the current time of the clock | 141 | * @get_time: function to retrieve the current time of the clock |