Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / drivers / net / epic100.c

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 57c8ac0ef3f1232d41e4f00399eb27b18170dcf6..aa56963ad55820e2a763d64c102a36ae1b35dabf 100644 (file)
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -131,8 +131,8 @@ IIIa. Ring buffers
 
 IVb. References
 
-http://www.smsc.com/main/tools/discontinued/83c171.pdf
-http://www.smsc.com/main/tools/discontinued/83c175.pdf
+http://www.smsc.com/media/Downloads_Public/discontinued/83c171.pdf
+http://www.smsc.com/media/Downloads_Public/discontinued/83c175.pdf
 http://scyld.com/expert/NWay.html
 http://www.national.com/pf/DP/DP83840A.html
 
@@ -758,7 +758,7 @@ static int epic_open(struct net_device *dev)
        init_timer(&ep->timer);
        ep->timer.expires = jiffies + 3*HZ;
        ep->timer.data = (unsigned long)dev;
-       ep->timer.function = &epic_timer;                               /* timer handler */
+       ep->timer.function = epic_timer;                                /* timer handler */
        add_timer(&ep->timer);
 
        return 0;