diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2007-05-25 05:50:53 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-07-09 18:07:39 -0400 |
commit | dd7f2928d834f7ac67202bcdf24a44ba9b138f08 (patch) | |
tree | c24379bfcc628c3f46b14105baa7885e592e856e /drivers/ieee1394/nodemgr.h | |
parent | 59337087cb33db58aa0d4463892b4475cf66a50b (diff) |
ieee1394: convert ieee1394 from "struct class_device" to "struct device"
Here is a straightforward conversion to "struct device". The "struct
class_device" will be removed from the kernel.
It seems to work fine for me with and without CONFIG_SYSFS_DEPRECATED
set.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/nodemgr.h')
-rw-r--r-- | drivers/ieee1394/nodemgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index 4530b29d941c..919e92e2a955 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h | |||
@@ -84,7 +84,7 @@ struct unit_directory { | |||
84 | int length; /* Number of quadlets */ | 84 | int length; /* Number of quadlets */ |
85 | 85 | ||
86 | struct device device; | 86 | struct device device; |
87 | struct class_device class_dev; | 87 | struct device unit_dev; |
88 | 88 | ||
89 | struct csr1212_keyval *ud_kv; | 89 | struct csr1212_keyval *ud_kv; |
90 | u32 lun; /* logical unit number immediate value */ | 90 | u32 lun; /* logical unit number immediate value */ |
@@ -107,7 +107,7 @@ struct node_entry { | |||
107 | u32 capabilities; | 107 | u32 capabilities; |
108 | 108 | ||
109 | struct device device; | 109 | struct device device; |
110 | struct class_device class_dev; | 110 | struct device node_dev; |
111 | 111 | ||
112 | /* Means this node is not attached anymore */ | 112 | /* Means this node is not attached anymore */ |
113 | int in_limbo; | 113 | int in_limbo; |