Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6] / drivers / net / hamradio / yam.c

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 401724ddafcd83fd61d048a3163361946529ff20..1c942862a3f4944710de74c546cba66943b8b81a 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -1097,8 +1097,7 @@ static void yam_setup(struct net_device *dev)
 
        skb_queue_head_init(&yp->send_queue);
 
-       dev->hard_header = ax25_hard_header;
-       dev->rebuild_header = ax25_rebuild_header;
+       dev->header_ops = &ax25_header_ops;
 
        dev->set_mac_address = yam_set_mac_address;