diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /drivers/s390/char/con3215.c | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
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 *) |