diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2017-11-07 11:59:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-07 11:59:40 +0100 |
| commit | 1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff (patch) | |
| tree | 3fb75d197d16d63878fdb4a478e9f6a555a95f80 /include/linux | |
| parent | Merge tag 'timers-conversion-next3' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core (diff) | |
| parent | block/aoe: discover_timer: Convert timers to use timer_setup() (diff) | |
| download | wireguard-linux-1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff.tar.xz wireguard-linux-1c10bbee8cf7c8df4e5d9e8ccc9754b200f625ff.zip | |
Merge tag 'timers-conversion-next4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core
Pull the 4th timer conversion batch from Kees Cook
- A couple fixes for less common build configurations
- More stragglers that have either been reviewed or gone
long enough on list
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index dc152e4b7f73..cc412175d036 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1211,7 +1211,7 @@ extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout); extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); -extern void ide_timer_expiry(unsigned long); +extern void ide_timer_expiry(struct timer_list *t); extern irqreturn_t ide_intr(int irq, void *dev_id); extern void do_ide_request(struct request_queue *); extern void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq); |