diff options
Diffstat (limited to 'drivers/s390/net/cu3088.c')
-rw-r--r-- | drivers/s390/net/cu3088.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c index f4a32375c037..48383459e99b 100644 --- a/drivers/s390/net/cu3088.c +++ b/drivers/s390/net/cu3088.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
27 | 27 | ||
28 | #include <asm/s390_rdev.h> | ||
29 | #include <asm/ccwdev.h> | 28 | #include <asm/ccwdev.h> |
30 | #include <asm/ccwgroup.h> | 29 | #include <asm/ccwgroup.h> |
31 | 30 | ||
@@ -120,12 +119,12 @@ cu3088_init (void) | |||
120 | { | 119 | { |
121 | int rc; | 120 | int rc; |
122 | 121 | ||
123 | cu3088_root_dev = s390_root_dev_register("cu3088"); | 122 | cu3088_root_dev = root_device_register("cu3088"); |
124 | if (IS_ERR(cu3088_root_dev)) | 123 | if (IS_ERR(cu3088_root_dev)) |
125 | return PTR_ERR(cu3088_root_dev); | 124 | return PTR_ERR(cu3088_root_dev); |
126 | rc = ccw_driver_register(&cu3088_driver); | 125 | rc = ccw_driver_register(&cu3088_driver); |
127 | if (rc) | 126 | if (rc) |
128 | s390_root_dev_unregister(cu3088_root_dev); | 127 | root_device_unregister(cu3088_root_dev); |
129 | 128 | ||
130 | return rc; | 129 | return rc; |
131 | } | 130 | } |
@@ -134,7 +133,7 @@ static void __exit | |||
134 | cu3088_exit (void) | 133 | cu3088_exit (void) |
135 | { | 134 | { |
136 | ccw_driver_unregister(&cu3088_driver); | 135 | ccw_driver_unregister(&cu3088_driver); |
137 | s390_root_dev_unregister(cu3088_root_dev); | 136 | root_device_unregister(cu3088_root_dev); |
138 | } | 137 | } |
139 | 138 | ||
140 | MODULE_DEVICE_TABLE(ccw,cu3088_ids); | 139 | MODULE_DEVICE_TABLE(ccw,cu3088_ids); |