diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/pcmcia/xirc2ps_cs.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 62664c01eb45..f3914f58d67f 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
| @@ -308,7 +308,7 @@ static void xirc2ps_detach(struct pcmcia_device *p_dev); | |||
| 308 | * less on other parts of the kernel. | 308 | * less on other parts of the kernel. |
| 309 | */ | 309 | */ |
| 310 | 310 | ||
| 311 | static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 311 | static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id); |
| 312 | 312 | ||
| 313 | /**************** | 313 | /**************** |
| 314 | * A linked list of "instances" of the device. Each actual | 314 | * A linked list of "instances" of the device. Each actual |
| @@ -1121,7 +1121,7 @@ static int xirc2ps_resume(struct pcmcia_device *link) | |||
| 1121 | * This is the Interrupt service route. | 1121 | * This is the Interrupt service route. |
| 1122 | */ | 1122 | */ |
| 1123 | static irqreturn_t | 1123 | static irqreturn_t |
| 1124 | xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1124 | xirc2ps_interrupt(int irq, void *dev_id) |
| 1125 | { | 1125 | { |
| 1126 | struct net_device *dev = (struct net_device *)dev_id; | 1126 | struct net_device *dev = (struct net_device *)dev_id; |
| 1127 | local_info_t *lp = netdev_priv(dev); | 1127 | local_info_t *lp = netdev_priv(dev); |