diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2003-05-20 22:07:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2003-05-20 22:07:48 -0400 |
| commit | e481b6a62e2f8901451848668cd319cafc3f1431 (patch) | |
| tree | 45025943e039a532d56e5e5645c40616b0628251 /include/linux | |
| parent | 07ca08b17cd52e7797ace521e94716677abb1db5 (diff) | |
| parent | a83cc9834cab02904452a62dc8586171314d3ddf (diff) | |
Merge redhat.com:/garz/repo/linus-2.5
into redhat.com:/garz/repo/net-drivers-2.5
Diffstat (limited to 'include/linux')
| -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 3c37d0538cc2..10a801b0ef9b 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); |