Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

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

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e091756166a3ad9a069b57c9ca52c2a404c65dfb..4fdfa2ae5418e6c030be80b5568e3c12dcbbf3f9 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1368,7 +1368,7 @@ static const struct file_operations tun_fops = {
 static struct miscdevice tun_miscdev = {
        .minor = TUN_MINOR,
        .name = "tun",
-       .devnode = "net/tun",
+       .nodename = "net/tun",
        .fops = &tun_fops,
 };