Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / net / atm / mpc.c

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 3ccca42e6f90ad476706770b78cce263c736f02e..aa972409f0934845eddd15bb16d0b82d44770986 100644 (file)
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -1005,7 +1005,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier,
        struct mpoa_client *mpc;
        struct lec_priv *priv;
 
-       dev = (struct net_device *)dev_ptr;
+       dev = dev_ptr;
 
        if (!net_eq(dev_net(dev), &init_net))
                return NOTIFY_DONE;