diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/linux/firewire.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'include/linux/firewire.h')
| -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 fc023d67676f..c64f3680d4f1 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h | |||
| @@ -93,7 +93,7 @@ struct fw_card { | |||
| 93 | int current_tlabel; | 93 | int current_tlabel; |
| 94 | u64 tlabel_mask; | 94 | u64 tlabel_mask; |
| 95 | struct list_head transaction_list; | 95 | struct list_head transaction_list; |
| 96 | unsigned long reset_jiffies; | 96 | u64 reset_jiffies; |
| 97 | 97 | ||
| 98 | u32 split_timeout_hi; | 98 | u32 split_timeout_hi; |
| 99 | u32 split_timeout_lo; | 99 | u32 split_timeout_lo; |