diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /net/core/netpoll.c | |
parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (diff) | |
parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 (diff) | |
download | op-kernel-dev-7d9aca39dcacd2b3f42e2e287162329f410f93e1.zip op-kernel-dev-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.gz |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 556b082..ddefc51 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -194,7 +194,7 @@ static void netpoll_poll_dev(struct net_device *dev) poll_napi(dev); - if (dev->priv_flags & IFF_SLAVE) { + if (dev->flags & IFF_SLAVE) { if (dev->npinfo) { struct net_device *bond_dev = dev->master; struct sk_buff *skb; |