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

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

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 6b4a0f9e38deeb3d4852639ec4c3d83684e5612f..5ec17563142e22cc6f6ff1e3ec76db23666d3ec9 100644 (file)
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -13,13 +13,13 @@ struct slip_init {
        char *gate_addr;
 };
 
-void slip_init(struct net_device *dev, void *data)
+static void slip_init(struct net_device *dev, void *data)
 {
        struct uml_net_private *private;
        struct slip_data *spri;
        struct slip_init *init = data;
 
-       private = dev->priv;
+       private = netdev_priv(dev);
        spri = (struct slip_data *) private->user;
 
        memset(spri->name, 0, sizeof(spri->name));
@@ -57,7 +57,7 @@ static int slip_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
                               (struct slip_data *) &lp->user);
 }
 
-const struct net_kern_info slip_kern_info = {
+static const struct net_kern_info slip_kern_info = {
        .init                   = slip_init,
        .protocol               = slip_protocol,
        .read                   = slip_read,