Merge branch 'linus' into timers/hpet

[linux-2.6-omap-h63xx.git] / include / net / syncppp.h

diff --git a/include/net/syncppp.h b/include/net/syncppp.h
index 877efa434700bec7d7a997b8492568be0316af5a..e43f4070d892fbb1d7173bfaf840c4702f72afef 100644 (file)
--- a/include/net/syncppp.h
+++ b/include/net/syncppp.h
@@ -59,7 +59,7 @@ struct ppp_device
 
 static inline struct sppp *sppp_of(struct net_device *dev) 
 {
-       struct ppp_device **ppp = dev->priv;
+       struct ppp_device **ppp = dev->ml_priv;
        BUG_ON((*ppp)->dev != dev);
        return &(*ppp)->sppp;
 }