[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/ieee1394/eth1394.h b/drivers/ieee1394/eth1394.h
index a3439ee7cb4e..4f3e2dd46f00 100644
--- a/drivers/ieee1394/eth1394.h
+++ b/drivers/ieee1394/eth1394.h
@@ -66,6 +66,10 @@ struct eth1394_priv {
         int bc_dgl;                     /* Outgoing broadcast datagram label */
         struct list_head ip_node_list;  /* List of IP capable nodes      */
         struct unit_directory *ud_list[ALL_NODES]; /* Cached unit dir list */
+
+        struct work_struct wake;        /* Wake up after xmit failure    */
+        struct net_device *wake_dev;    /* Stupid backlink for .wake     */
+        nodeid_t wake_node;             /* Destination of failed xmit    */
 };