jbd: clean up journal_try_to_free_buffers()

[safe/jmp/linux-2.6] / include / linux / firewire.h

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index a69aea0..e584b72 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -98,7 +98,8 @@ struct fw_card {
 
        int node_id;
        int generation;
-       int current_tlabel, tlabel_mask;
+       int current_tlabel;
+       u64 tlabel_mask;
        struct list_head transaction_list;
        struct timer_list flush_timer;
        unsigned long reset_jiffies;
@@ -191,7 +192,9 @@ struct fw_device {
        size_t config_rom_length;
        int config_rom_retries;
        unsigned is_local:1;
+       unsigned max_rec:4;
        unsigned cmc:1;
+       unsigned irmc:1;
        unsigned bc_implemented:2;
 
        struct delayed_work work;