aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-13 06:10:10 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-15 22:01:05 -0400
commitcfb9a514bc119e96c980115c055e8fd7e64a7abf (patch)
tree1031cc0ae1f36956e8af8216c8886ebe105a795e /drivers/net/ethernet/micrel
parentnet: pxa168_eth: remove deprecated IRQF_DISABLED (diff)
downloadlinux-dev-cfb9a514bc119e96c980115c055e8fd7e64a7abf.tar.xz
linux-dev-cfb9a514bc119e96c980115c055e8fd7e64a7abf.zip
net: ks8851-ml: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from drivers/net/ethernet/micrel/ks8851_mll.c It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
-rw-r--r--drivers/net/ethernet/micrel/ks8851_mll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 0fba1532d326..075f4e21d33d 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -915,7 +915,7 @@ static int ks_net_open(struct net_device *netdev)
struct ks_net *ks = netdev_priv(netdev);
int err;
-#define KS_INT_FLAGS (IRQF_DISABLED|IRQF_TRIGGER_LOW)
+#define KS_INT_FLAGS IRQF_TRIGGER_LOW
/* lock the card, even if we may not actually do anything
* else at the moment.
*/