Commit 0ae842ea authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'ucc_geth' of... 

Merge branch 'ucc_geth' of master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc into upstream-fixes
parents 8eb7ad68 7c5b0162

drivers/net/ucc_geth_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static const struct ethtool_ops uec_ethtool_ops = { 
	.get_stats_count        = uec_get_stats_count,

	.get_strings            = uec_get_strings,

	.get_ethtool_stats      = uec_get_ethtool_stats,

	.get_perm_addr          = ethtool_op_get_perm_addr,

};



void uec_set_ethtool_ops(struct net_device *netdev)

drivers/net/ucc_geth_mii.c

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ int __init uec_mdio_init(void) 
	return of_register_platform_driver(&uec_mdio_driver);

}



void __exit uec_mdio_exit(void)

/* called from __init ucc_geth_init, therefore can not be __exit */

void uec_mdio_exit(void)

{

	of_unregister_platform_driver(&uec_mdio_driver);

}