diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2003-05-25 11:49:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2003-05-25 11:49:53 -0400 |
| commit | 3b9fb4e8dc9b6080805ce397c74ef1f0f7cda076 (patch) | |
| tree | fba64b9463c149d01f1c39de9585b100661718b2 /include/linux/arcdevice.h | |
| parent | dc2f9764e8784817355504b5a78bed08578e2d46 (diff) | |
| parent | 26da9f9f2dbf72da5c90f28f50d1821405c040e2 (diff) | |
Merge redhat.com:/garz/repo/linus-2.5
into redhat.com:/garz/repo/net-drivers-2.5
Diffstat (limited to 'include/linux/arcdevice.h')
| -rw-r--r-- | include/linux/arcdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index 8ddb454c85b5..b706151a0003 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h @@ -329,7 +329,7 @@ void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc); #endif void arcnet_unregister_proto(struct ArcProto *proto); -void arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs); +irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs); void arcdev_setup(struct net_device *dev); void arcnet_rx(struct net_device *dev, int bufnum); |