diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:18:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:18:00 +1100 |
| commit | 79ccc594de619812bb167a117dd3d23a03a4b08d (patch) | |
| tree | 7017f404a038620dd1ec97385ac07c4a449485e4 /include | |
| parent | ceff63e6553d2610795e84af866dd32621a0bc9d (diff) | |
| parent | d63e275a354f614b2dc9a3a55c31dedc593833da (diff) | |
Merge remote-tracking 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; |