X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Ffirewire.h;h=72e2b8ac2a5a997b8d055e72d81d7358cddf6dce;hb=29d03fa12bc02c0f8085cd6bb06d11359a4bccaf;hp=a527d73f99663f2c9e7ddfa0f38d6a77aaec0c10;hpb=edd5bdaf128e04066caac84fcb21377197ea0d64;p=pandora-kernel.git

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index a527d73f9966..72e2b8ac2a5a 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -87,7 +87,6 @@ struct fw_card {
 	int current_tlabel;
 	u64 tlabel_mask;
 	struct list_head transaction_list;
-	struct timer_list flush_timer;
 	unsigned long reset_jiffies;
 
 	unsigned long long guid;
@@ -288,6 +287,8 @@ struct fw_transaction {
 	int tlabel;
 	int timestamp;
 	struct list_head link;
+	struct fw_card *card;
+	struct timer_list split_timeout_timer;
 
 	struct fw_packet packet;