From 52e53bdb7205ca6bf388fd4738242ee2b3cee1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9guier=20R=C3=A9gis?= Date: Thu, 9 Apr 2009 01:33:57 +0000 Subject: [PATCH] --- yaml --- r: 143416 b: refs/heads/master c: 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/via-velocity.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f4057b2bddf..cd9f5e600fde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57401d5e36d2966247e9c06b94f5133609c8da21 +refs/heads/master: 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index fb53ef872df3..754a4b182c1d 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/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 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev) * 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);