Merge branch 'dmaengine' into async-tx-next

[mv-sheeva.git] / net / 802 / hippi.c

diff --git a/net/802/hippi.c b/net/802/hippi.c
index 313b9ebf92ee23fb4b2b6e6d1dfb2ce75432368c..cd3e8e9295295fd3746cc20bd9068de5c7338d5b 100644 (file)
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -193,11 +193,6 @@ static const struct header_ops hippi_header_ops = {
 
 static void hippi_setup(struct net_device *dev)
 {
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-       dev->change_mtu                 = hippi_change_mtu;
-       dev->set_mac_address            = hippi_mac_addr;
-       dev->neigh_setup                = hippi_neigh_setup_dev;
-#endif
        dev->header_ops                 = &hippi_header_ops;
 
        /*