Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[deliverable/linux.git] / drivers / net / dummy.c

diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 0932ffbf381b5b5c877b9988318912fcea930473..ff435fbd1ad0e8b32a8299211a890b1f5b9deb31 100644 (file)
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -164,7 +164,7 @@ static int __init dummy_init_one(void)
        struct net_device *dev_dummy;
        int err;
 
-       dev_dummy = alloc_netdev(0, "dummy%d", dummy_setup);
+       dev_dummy = alloc_netdev(0, "dummy%d", NET_NAME_UNKNOWN, dummy_setup);
        if (!dev_dummy)
                return -ENOMEM;