Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / net / slip / slip.c

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 1a6e2ea..d9ebe38 100644 (file)
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -719,7 +719,7 @@ static void sl_sync(void)
 
 
 /* Find a free SLIP channel, and link in this `tty' line. */
-static struct slip *sl_alloc(dev_t line)
+static struct slip *sl_alloc(void)
 {
        int i;
        char name[IFNAMSIZ];
@@ -800,7 +800,7 @@ static int slip_open(struct tty_struct *tty)
 
        /* OK.  Find a free SLIP channel to use. */
        err = -ENFILE;
-       sl = sl_alloc(tty_devnum(tty));
+       sl = sl_alloc();
        if (sl == NULL)
                goto err_exit;