Merge branch 'fix/asoc' into for-linus

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

diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h
index 9bc3b688d2ee837f764b0a13aa7da83c1d6bc96e..f148e49084106fca84ae61b2880420dc0bc2798d 100644 (file)
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
@@ -31,9 +31,10 @@ struct hippi_cb {
        __u32   ifield;
 };
 
-extern unsigned short hippi_type_trans(struct sk_buff *skb,
-                                      struct net_device *dev);
-
+extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern int hippi_change_mtu(struct net_device *dev, int new_mtu);
+extern int hippi_mac_addr(struct net_device *dev, void *p);
+extern int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p);
 extern struct net_device *alloc_hippi_dev(int sizeof_priv);
 #endif