diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
| commit | 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b (patch) | |
| tree | a92d8a6b3806ec3416ca2b28c45174fca9c4833e /include/linux | |
| parent | d4fbeabbc9e68c80738fe59135d201c3ed5fe40f (diff) | |
| parent | 26df54bffd90977fbc6fe8284f2beaed19fea44f (diff) | |
Merge branch 'janitor'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/arcdevice.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index 7198f129e135..231ba090ae34 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h @@ -206,7 +206,6 @@ struct ArcProto { extern struct ArcProto *arc_proto_map[256], *arc_proto_default, *arc_bcast_proto, *arc_raw_proto; -extern struct ArcProto arc_proto_null; /* @@ -334,17 +333,9 @@ void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc); #define arcnet_dump_skb(dev,skb,desc) ; #endif -#if (ARCNET_DEBUG_MAX & D_RX) || (ARCNET_DEBUG_MAX & D_TX) -void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc, - int take_arcnet_lock); -#else -#define arcnet_dump_packet(dev, bufnum, desc,take_arcnet_lock) ; -#endif - void arcnet_unregister_proto(struct ArcProto *proto); irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs); struct net_device *alloc_arcdev(char *name); -void arcnet_rx(struct net_device *dev, int bufnum); #endif /* __KERNEL__ */ #endif /* _LINUX_ARCDEVICE_H */ |