Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Garzik 2007-08-07 17:19:44 -04:00
commit 0ae842eaf9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ucc_geth_ethtool.c
View File

@ -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)

3
drivers/net/ucc_geth_mii.c
View File

@ -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);
}