Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux

[mv-sheeva.git] / include / linux / firewire.h

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 1cd637ef62d2ff73be203a76e930e73c87b209f1..9a3f5f9383f69748ff4cb5857694de9c6fe9e296 100644 (file)
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -302,9 +302,9 @@ struct fw_packet {
 struct fw_transaction {
        int node_id; /* The generation is implied; it is always the current. */
        int tlabel;
-       int timestamp;
        struct list_head link;
        struct fw_card *card;
+       bool is_split_transaction;
        struct timer_list split_timeout_timer;
 
        struct fw_packet packet;