Merge branch 'x86/urgent' into x86-mm

[~andy/linux] / include / linux / firewire.h

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index fc023d67676f6e18be83551c8543806bc05e08b8..c64f3680d4f154b2bc2959380e0b04ecd5477d52 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -93,7 +93,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;