---

yaml --- r: 73459 b: refs/heads/master c: a5e68c0 h: refs/heads/master i: 73457: a8fff50 73455: 62dfd65 v: v3
git-mirror · Nov 10, 2007 · f1377cc · f1377cc
1 parent 03aadc4
commit f1377cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdb3f751cfe6d8d5737a2ff406d7169361b5dfb2
+refs/heads/master: a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3995,7 +3995,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 	dev->tx_timeout = sky2_tx_timeout;
 	dev->watchdog_timeo = TX_WATCHDOG;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = sky2_netpoll;
+	if (port == 0)
+		dev->poll_controller = sky2_netpoll;
 #endif
 
 	sky2 = netdev_priv(dev);