Merge branch 'for-next' into for-linus

[linux-2.6-block.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index ce1efa4c0b0dff284d94e05427f3743853aa1ac7..96c39bddc78c049e85411f6f298485b531356c78 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1437,7 +1437,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
 
                __tun_detach(tun);
 
-               /* If desireable, unregister the netdevice. */
+               /* If desirable, unregister the netdevice. */
                if (!(tun->flags & TUN_PERSIST)) {
                        rtnl_lock();
                        if (dev->reg_state == NETREG_REGISTERED)