Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_opal.c

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 61da5cd093fcca75f8092d55797da0825bc54cb7..cd69b48f6dfd390a8231f689b35f5d2588c16772 100644 (file)
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -178,7 +178,7 @@ static int hvc_opal_probe(struct platform_device *dev)
                proto = HV_PROTOCOL_HVSI;
                ops = &hvc_opal_hvsi_ops;
        } else {
-               pr_err("hvc_opal: Unkown protocol for %s\n",
+               pr_err("hvc_opal: Unknown protocol for %s\n",
                       dev->dev.of_node->full_name);
                return -ENXIO;
        }
@@ -222,7 +222,7 @@ static int hvc_opal_probe(struct platform_device *dev)
        return 0;
 }
 
-static int __devexit hvc_opal_remove(struct platform_device *dev)
+static int hvc_opal_remove(struct platform_device *dev)
 {
        struct hvc_struct *hp = dev_get_drvdata(&dev->dev);
        int rc, termno;