diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-29 14:33:40 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-29 14:33:40 +0300 |
| commit | 6c1e272f962da249f289846cec944bcd1c162a49 (patch) | |
| tree | 9ddd92dbd781521ab3038bdc248648d088ab6ed6 /include | |
| parent | 52f737c2da40259ac9962170ce608b6fb1b55ee4 (diff) | |
| parent | 74a0f5739292a636d337ad6f8d7cd0061636e0eb (diff) | |
| download | linux-6c1e272f962da249f289846cec944bcd1c162a49.tar.xz | |
Merge tag 'timers-conversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core
Pull first batch of scsi conversions that have been Reviewed or Acked from
Kees Cook.
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/libfcoe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index 722d3264d3bf..cb8a273732cf 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -382,7 +382,7 @@ static inline struct net_device *fcoe_get_netdev(const struct fc_lport *lport) void fcoe_clean_pending_queue(struct fc_lport *); void fcoe_check_wait_queue(struct fc_lport *lport, struct sk_buff *skb); -void fcoe_queue_timer(ulong lport); +void fcoe_queue_timer(struct timer_list *t); int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen, struct fcoe_percpu_s *fps); |