diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 04:05:53 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 04:05:53 -0400 |
| commit | 263c43a4479ecce52c0fdc84b4620e146263d549 (patch) | |
| tree | b29ad7d94892be7a40524400481f71a1c075a167 /drivers/net/ethernet/micrel/ks8851_mll.c | |
| parent | 873ee9ed2c020b59e22a5082f73fc2960ec959bf (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
Diffstat (limited to 'drivers/net/ethernet/micrel/ks8851_mll.c')
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 2 |
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) | |||
| 915 | struct ks_net *ks = netdev_priv(netdev); | 915 | struct ks_net *ks = netdev_priv(netdev); |
| 916 | int err; | 916 | int err; |
| 917 | 917 | ||
| 918 | #define KS_INT_FLAGS (IRQF_DISABLED|IRQF_TRIGGER_LOW) | 918 | #define KS_INT_FLAGS IRQF_TRIGGER_LOW |
| 919 | /* lock the card, even if we may not actually do anything | 919 | /* lock the card, even if we may not actually do anything |
| 920 | * else at the moment. | 920 | * else at the moment. |
| 921 | */ | 921 | */ |