Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / drivers / net / hamradio / dmascc.c

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 7e46114422375927775044fe691803c84d1f1858..e67103396ed7649b32a331e7f4d9fc341f6dc206 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -572,7 +572,7 @@ static int __init setup_adapter(int card_base, int type, int n)
                priv->param.persist = 256;
                priv->param.dma = -1;
                INIT_WORK(&priv->rx_work, rx_bh);
-               dev->priv = priv;
+               dev->ml_priv = priv;
                sprintf(dev->name, "dmascc%i", 2 * n + i);
                dev->base_addr = card_base;
                dev->irq = irq;
@@ -720,7 +720,7 @@ static int read_scc_data(struct scc_priv *priv)
 
 static int scc_open(struct net_device *dev)
 {
-       struct scc_priv *priv = dev->priv;
+       struct scc_priv *priv = dev->ml_priv;
        struct scc_info *info = priv->info;
        int card_base = priv->card_base;
 
@@ -862,7 +862,7 @@ static int scc_open(struct net_device *dev)
 
 static int scc_close(struct net_device *dev)
 {
-       struct scc_priv *priv = dev->priv;
+       struct scc_priv *priv = dev->ml_priv;
        struct scc_info *info = priv->info;
        int card_base = priv->card_base;
 
@@ -891,7 +891,7 @@ static int scc_close(struct net_device *dev)
 
 static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       struct scc_priv *priv = dev->priv;
+       struct scc_priv *priv = dev->ml_priv;
 
        switch (cmd) {
        case SIOCGSCCPARAM:
@@ -918,7 +918,7 @@ static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 static int scc_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
-       struct scc_priv *priv = dev->priv;
+       struct scc_priv *priv = dev->ml_priv;
        unsigned long flags;
        int i;
 
@@ -963,7 +963,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *scc_get_stats(struct net_device *dev)
 {
-       struct scc_priv *priv = dev->priv;
+       struct scc_priv *priv = dev->ml_priv;
 
        return &priv->stats;
 }