Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / ieee1394 / nodemgr.h

diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index e7ac683..919e92e 100644 (file)
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -75,6 +75,7 @@ struct unit_directory {
        struct csr1212_keyval *model_name_kv;
        quadlet_t specifier_id;
        quadlet_t version;
+       quadlet_t directory_id;
 
        unsigned int id;
 
@@ -83,7 +84,7 @@ struct unit_directory {
        int length;             /* Number of quadlets */
 
        struct device device;
-       struct class_device class_dev;
+       struct device unit_dev;
 
        struct csr1212_keyval *ud_kv;
        u32 lun;                /* logical unit number immediate value */
@@ -106,7 +107,7 @@ struct node_entry {
        u32 capabilities;
 
        struct device device;
-       struct class_device class_dev;
+       struct device node_dev;
 
        /* Means this node is not attached anymore */
        int in_limbo;