Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

[karo-tx-linux.git] / arch / um / drivers / daemon_kern.c

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index d53ff52bb40447942cff82fd93d001cfcc7200e1..b4a1522f21575bbdc1142e0c8653edf999f6c651 100644 (file)
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -22,7 +22,7 @@ static void daemon_init(struct net_device *dev, void *data)
        struct daemon_data *dpri;
        struct daemon_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        dpri = (struct daemon_data *) pri->user;
        dpri->sock_type = init->sock_type;
        dpri->ctl_sock = init->ctl_sock;