projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_conntrack/nf_nat: add TFTP helper port
[powerpc.git]
/
drivers
/
net
/
tulip
/
interrupt.c
diff --git
a/drivers/net/tulip/interrupt.c
b/drivers/net/tulip/interrupt.c
index
da4f759
..
e3488d7
100644
(file)
--- a/
drivers/net/tulip/interrupt.c
+++ b/
drivers/net/tulip/interrupt.c
@@
-1,7
+1,7
@@
/*
drivers/net/tulip/interrupt.c
/*
drivers/net/tulip/interrupt.c
- Maintained by
Jeff Garzik <jgarzik@pobox
.com>
+ Maintained by
Valerie Henson <val_henson@linux.intel
.com>
Copyright 2000,2001 The Linux Kernel Team
Written/copyright 1994-2001 by Donald Becker.
Copyright 2000,2001 The Linux Kernel Team
Written/copyright 1994-2001 by Donald Becker.
@@
-16,7
+16,6
@@
#include <linux/pci.h>
#include "tulip.h"
#include <linux/pci.h>
#include "tulip.h"
-#include <linux/config.h>
#include <linux/etherdevice.h>
int tulip_rx_copybreak;
#include <linux/etherdevice.h>
int tulip_rx_copybreak;
@@
-497,7
+496,7
@@
static inline unsigned int phy_interrupt (struct net_device *dev)
/* The interrupt handler does all of the Rx thread work and cleans up
after the Tx thread. */
/* The interrupt handler does all of the Rx thread work and cleans up
after the Tx thread. */
-irqreturn_t tulip_interrupt(int irq, void *dev_instance
, struct pt_regs *regs
)
+irqreturn_t tulip_interrupt(int irq, void *dev_instance)
{
struct net_device *dev = (struct net_device *)dev_instance;
struct tulip_private *tp = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *)dev_instance;
struct tulip_private *tp = netdev_priv(dev);