Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mirror_ubuntu-artful-kernel.git] / drivers / net / hamradio / mkiss.c

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index b8740e6a5ceca57a809dd443a4fd2623e3ad1ebc..3249df5e0f179c46582154de56c0e7b7a701a81a 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -971,7 +971,7 @@ out:
        mkiss_put(ax);
 }
 
-static struct tty_ldisc ax_ldisc = {
+static struct tty_ldisc_ops ax_ldisc = {
        .owner          = THIS_MODULE,
        .magic          = TTY_LDISC_MAGIC,
        .name           = "mkiss",