diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-14 13:34:43 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-14 13:34:43 -0700 |
| commit | 14de94f03d2c7562542599224e88965bc4d20a1d (patch) | |
| tree | be0ea1d0fd305bf61d91f11f7ffc31f930f1aa49 /include/linux | |
| parent | fed8e608c338037d3ae408089631b731d21a8d80 (diff) | |
| parent | 11bfbae19413a2ffe70378b6e572be263869a2bc (diff) | |
Merge tag 'v4.4.24' into android-4.4.y
This is the 4.4.24 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/can/dev.h | 3 | ||||
| -rw-r--r-- | include/linux/nvmem-consumer.h | 2 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 5261751f6bd4..5f5270941ba0 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -32,6 +32,7 @@ enum can_mode { * CAN common private data */ struct can_priv { + struct net_device *dev; struct can_device_stats can_stats; struct can_bittiming bittiming, data_bittiming; @@ -47,7 +48,7 @@ struct can_priv { u32 ctrlmode_static; /* static enabled options for driver/hardware */ int restart_ms; - struct timer_list restart_timer; + struct delayed_work restart_work; int (*do_set_bittiming)(struct net_device *dev); int (*do_set_data_bittiming)(struct net_device *dev); diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h index 9bb77d3ed6e0..c2256d746543 100644 --- a/include/linux/nvmem-consumer.h +++ b/include/linux/nvmem-consumer.h @@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell) { } -static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) +static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) { return ERR_PTR(-ENOSYS); } diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index fa7bc29925c9..ef17db6caaed 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -41,6 +41,8 @@ extern int proc_dostring(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); +extern int proc_douintvec(struct ctl_table *, int, + void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_jiffies(struct ctl_table *, int, |