git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
atari_pamsnet.c
diff --git
a/drivers/net/atari_pamsnet.c
b/drivers/net/atari_pamsnet.c
index
d6039e6
..
3b54361
100644
(file)
--- a/
drivers/net/atari_pamsnet.c
+++ b/
drivers/net/atari_pamsnet.c
@@
-163,7
+163,7
@@
static int pamsnet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
-static irqreturn_t pamsnet_intr(int irq, void *data
, struct pt_regs *fp
);
+static irqreturn_t pamsnet_intr(int irq, void *data);
static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
@@
-494,7
+494,6
@@
static irqreturn_t
pamsnet_intr(irq, data, fp)
int irq;
void *data;
pamsnet_intr(irq, data, fp)
int irq;
void *data;
- struct pt_regs *fp;
{
return IRQ_HANDLED;
}
{
return IRQ_HANDLED;
}
@@
-857,7
+856,7
@@
pamsnet_close(struct net_device *dev) {
/* Get the current statistics.
This may be called with the card open or closed.
*/
/* Get the current statistics.
This may be called with the card open or closed.
*/
-static struct net_device_stats *net_get_stats(struct net_device *dev)
+static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;