diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-25 03:31:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-25 03:31:31 -0700 |
| commit | 81c830a4896279033ee98b8b741b6a72ae737053 (patch) | |
| tree | d7b1b0fdc7ca315aeab5f09244f6820c3febac3a /include | |
| parent | 01166d963aabab97d0d0d757b6a6e115c8a2cfcf (diff) | |
| parent | cd8286cfdef7eb2ad5f9feb6543ccca1e3580272 (diff) | |
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -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); |