diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/firewire.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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; |