diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /drivers/s390/char/con3215.c | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
Diffstat (limited to 'drivers/s390/char/con3215.c')
| -rw-r--r-- | drivers/s390/char/con3215.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 1f060914cfa4..606f6ad285a0 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/console.h> | 22 | #include <linux/console.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/err.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
| 26 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
| @@ -864,7 +865,7 @@ con3215_init(void) | |||
| 864 | } | 865 | } |
| 865 | 866 | ||
| 866 | cdev = ccw_device_probe_console(); | 867 | cdev = ccw_device_probe_console(); |
| 867 | if (!cdev) | 868 | if (IS_ERR(cdev)) |
| 868 | return -ENODEV; | 869 | return -ENODEV; |
| 869 | 870 | ||
| 870 | raw3215[0] = raw = (struct raw3215_info *) | 871 | raw3215[0] = raw = (struct raw3215_info *) |