summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-01-11 14:18:52 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-01-11 14:18:52 -0500
commit3fa8f1488ea6c7d34f59f88b3805efd47cc1be4d (patch)
tree74b729072a3d371aaba28e0ab26ee2a7846752e5 /include/linux
parent04a2b7d012f4ad13f22fe001cc13e657659b0924 (diff)
parentadec6e14f850cf677796d6571149437f6663b535 (diff)
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/arcdevice.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index bd4364daf948..7198f129e135 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -343,7 +343,6 @@ void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc,
void arcnet_unregister_proto(struct ArcProto *proto);
irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-void arcdev_setup(struct net_device *dev);
struct net_device *alloc_arcdev(char *name);
void arcnet_rx(struct net_device *dev, int bufnum);