Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 3a750dd39be12083935c5cdbb9633f9a3b786cfd..2860525f8ff6d56219e81dd2fe7afa8f3c627c35 100644 (file)
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -21,7 +21,7 @@ void pcap_init(struct net_device *dev, void *data)
        struct pcap_data *ppri;
        struct pcap_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        ppri = (struct pcap_data *) pri->user;
        ppri->host_if = init->host_if;
        ppri->promisc = init->promisc;