Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / atp.c

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index bd2f9d3..f345979 100644 (file)
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -68,7 +68,7 @@ static int xcvr[NUM_UNITS];                   /* The data transfer mode. */
 
        In 1997 Realtek made available the documentation for the second generation
        RTL8012 chip, which has lead to several driver improvements.
-         http://www.realtek.com.tw/cn/cn.html
+         http://www.realtek.com.tw/
 
                                        Theory of Operation
 
@@ -445,7 +445,7 @@ static int net_open(struct net_device *dev)
        init_timer(&lp->timer);
        lp->timer.expires = jiffies + TIMED_CHECKER;
        lp->timer.data = (unsigned long)dev;
-       lp->timer.function = &atp_timed_checker;    /* timer handler */
+       lp->timer.function = atp_timed_checker;    /* timer handler */
        add_timer(&lp->timer);
 
        netif_start_queue(dev);