git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
include
/
linux
/
arcdevice.h
diff --git
a/include/linux/arcdevice.h
b/include/linux/arcdevice.h
index 231ba090ae34c0617e54f9f20cf6f2a50a7e14b2..2f85049cfb3d1ca94b1b9680bf3db2802b590acf 100644
(file)
--- a/
include/linux/arcdevice.h
+++ b/
include/linux/arcdevice.h
@@
-334,7
+334,7
@@
void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
#endif
void arcnet_unregister_proto(struct ArcProto *proto);
#endif
void arcnet_unregister_proto(struct ArcProto *proto);
-irqreturn_t arcnet_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+irqreturn_t arcnet_interrupt(int irq, void *dev_id);
struct net_device *alloc_arcdev(char *name);
#endif /* __KERNEL__ */
struct net_device *alloc_arcdev(char *name);
#endif /* __KERNEL__ */