Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6-omap-h63xx.git] / arch / um / drivers / vde_kern.c

diff --git a/arch/um/drivers/vde_kern.c b/arch/um/drivers/vde_kern.c
index add7e722defb3a8b331a38d11302b6e290e64d9d..1b852bffdebcf019d61c66dda7f4da77e4e1ff1f 100644 (file)
--- a/arch/um/drivers/vde_kern.c
+++ b/arch/um/drivers/vde_kern.c
@@ -19,7 +19,7 @@ static void vde_init(struct net_device *dev, void *data)
        struct uml_net_private *pri;
        struct vde_data *vpri;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        vpri = (struct vde_data *) pri->user;
 
        vpri->vde_switch = init->vde_switch;