[XFS] Fix merge failures

[pandora-kernel.git] / arch / um / os-Linux / drivers / ethertap_kern.c

diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
index 046a131..7f6f9a7 100644 (file)
--- a/arch/um/os-Linux/drivers/ethertap_kern.c
+++ b/arch/um/os-Linux/drivers/ethertap_kern.c
@@ -22,7 +22,7 @@ static void etap_init(struct net_device *dev, void *data)
        struct ethertap_data *epri;
        struct ethertap_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        epri = (struct ethertap_data *) pri->user;
        epri->dev_name = init->dev_name;
        epri->gate_addr = init->gate_addr;