diff options
| author |   Séguier Régis <rseguier@e-teleport.net> | 2009-04-09 01:33:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-04-11 01:52:38 -0700 |
| commit | 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 (patch) | |
| tree | c5aa1d5fc43089c2e1e20fd6a0bbf52f3dfea8f7 /drivers/net/via-velocity.c | |
| parent | phy: error handling for platform_device_register_simple() (diff) | |
| download | linux-dev-3ca17dfbdcaf3def764e72751619b1cc2c9760b9.tar.xz linux-dev-3ca17dfbdcaf3def764e72751619b1cc2c9760b9.zip | |
via-velocity : fix compilation warning.
Fix this warning:
drivers/net/via-velocity.c:1924: warning: passing argument 2 of 'request_irq' from incompatible pointer type
Signed-off-by: Seguier Regis <rseguier@e-teleport.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index fb53ef872df3..754a4b182c1d 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -377,7 +377,7 @@ static void velocity_print_info(struct velocity_info *vptr); static int velocity_open(struct net_device *dev); static int velocity_change_mtu(struct net_device *dev, int mtu); static int velocity_xmit(struct sk_buff *skb, struct net_device *dev); -static int velocity_intr(int irq, void *dev_instance); +static irqreturn_t velocity_intr(int irq, void *dev_instance); static void velocity_set_multi(struct net_device *dev); static struct net_device_stats *velocity_get_stats(struct net_device *dev); static int velocity_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); @@ -2215,7 +2215,7 @@ out: * efficiently as possible. */ -static int velocity_intr(int irq, void *dev_instance) +static irqreturn_t velocity_intr(int irq, void *dev_instance) { struct net_device *dev = dev_instance; struct velocity_info *vptr = netdev_priv(dev); |