Merge branch 'linus' into x86/tracehook

[karo-tx-linux.git] / drivers / ieee1394 / nodemgr.h

diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index 4530b29d941c37c0bc74debaeab810920057b363..6eb26465a84ca44029c4d43cc3ba17ba1eb1c378 100644 (file)
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -84,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 */
@@ -97,7 +97,7 @@ struct node_entry {
        struct hpsb_host *host;         /* Host this node is attached to */
        nodeid_t nodeid;                /* NodeID */
        struct bus_options busopt;      /* Bus Options */
-       int needs_probe;
+       bool needs_probe;
        unsigned int generation;        /* Synced with hpsb generation */
 
        /* The following is read from the config rom */
@@ -107,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;