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

[mirror_ubuntu-zesty-kernel.git] / drivers / char / hvc_console.c

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index d8dac5820f0e601379448716883e437356ea5915..4c3b59be286add18bcf32b500ff84d8a4f88c36a 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -748,9 +748,9 @@ static const struct tty_operations hvc_ops = {
        .chars_in_buffer = hvc_chars_in_buffer,
 };
 
-struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
-                                      const struct hv_ops *ops,
-                                      int outbuf_size)
+struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
+                            const struct hv_ops *ops,
+                            int outbuf_size)
 {
        struct hvc_struct *hp;
        int i;