Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: schedule for removal
  firewire: core: use separate timeout for each transaction
  firewire: core: Fix tlabel exhaustion problem
  firewire: core: make transaction label allocation more robust
  firewire: core: clean up config ROM related defined constants
  ieee1394: mark char device files as not seekable
  firewire: cdev: mark char device files as not seekable
  firewire: ohci: cleanups and fix for nonstandard build without debug facility
  firewire: ohci: wait for PHY register accesses to complete
  firewire: ohci: fix up configuration of TI chips
  firewire: ohci: enable 1394a enhancements
  firewire: ohci: do not clear PHY interrupt status inadvertently
  firewire: ohci: add a function for reading PHY registers

Trivial conflicts in Documentation/feature-removal-schedule.txt

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 4bd94bf5e739..72e2b8ac2a5a 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -55,13 +55,11 @@
 #define CSR_DESCRIPTOR          0x01
 #define CSR_VENDOR              0x03
 #define CSR_HARDWARE_VERSION    0x04
-#define CSR_NODE_CAPABILITIES   0x0c
 #define CSR_UNIT                0x11
 #define CSR_SPECIFIER_ID        0x12
 #define CSR_VERSION             0x13
 #define CSR_DEPENDENT_INFO      0x14
 #define CSR_MODEL               0x17
-#define CSR_INSTANCE            0x18
 #define CSR_DIRECTORY_ID        0x20
 
 struct fw_csr_iterator {
@@ -89,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;
@@ -290,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;