diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 12:30:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 12:30:19 +1100 |
| commit | 009824b9d6eef66820fdece2415231a19abe95f5 (patch) | |
| tree | 7f424607f539e7864d578e25ba4146b59f1425c7 /include | |
| parent | 9fe86de9450d240b745119ce734844495457381c (diff) | |
| parent | 9127803a58498b50443e5e129f7b8acf6b9b0bab (diff) | |
Merge remote branch 'ieee1394/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firewire.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 9a3f5f9383f6..b6d21d5a11a2 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -89,7 +89,7 @@ struct fw_card { int current_tlabel; u64 tlabel_mask; struct list_head transaction_list; - unsigned long reset_jiffies; + u64 reset_jiffies; u32 split_timeout_hi; u32 split_timeout_lo; |