diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
| commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
| tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /drivers/net/ethernet/micrel | |
| parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
| parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'drivers/net/ethernet/micrel')
| -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 | */ |