Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

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

diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
index 822092f149bedb666740b1958b0778cd9ca01b3d..ffc6416d5ed7f9af80a2490133050098fb8083aa 100644 (file)
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -28,7 +28,7 @@ static void mcast_init(struct net_device *dev, void *data)
        struct mcast_data *dpri;
        struct mcast_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        dpri = (struct mcast_data *) pri->user;
        dpri->addr = init->addr;
        dpri->port = init->port;
@@ -58,7 +58,7 @@ static const struct net_kern_info mcast_kern_info = {
        .write                  = mcast_write,
 };
 
-int mcast_setup(char *str, char **mac_out, void *data)
+static int mcast_setup(char *str, char **mac_out, void *data)
 {
        struct mcast_init *init = data;
        char *port_str = NULL, *ttl_str = NULL, *remain;