Merge branch 'odroidc-3.10.y' of github.com:hardkernel/linux into odr…

…oidc-3.10.y
hardkernel · Jan 3, 2018 · 20e1fdd · 20e1fdd
2 parents 30a7085 + e256c9f
commit 20e1fdd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/amlogic/ethernet/am_net8218.c b/drivers/amlogic/ethernet/am_net8218.c
@@ -1470,7 +1470,9 @@ static const struct net_device_ops am_netdev_ops = {
 	.ndo_change_mtu         = eth_change_mtu,
 	.ndo_set_mac_address    = set_mac_addr_n,
 	.ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
 	.ndo_poll_controller	= fake_netpoll,
+#endif
 };
 
 static int aml_ethtool_get_settings(struct net_device *dev,