diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-08-07 17:19:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-08-07 17:19:44 -0400 |
| commit | 0ae842eaf9512d9c9479797083750c077fc7d1f8 (patch) | |
| tree | ac17a86cd0f4ce5a3db96bafc29bc968e8bf1f1f | |
| parent | 8eb7ad68bd10d858066ca51713ca5645996e77a5 (diff) | |
| parent | 7c5b016246a889ec4b5dc8d40cab525e888a649e (diff) | |
Merge branch 'ucc_geth' of master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc into upstream-fixes
| -rw-r--r-- | drivers/net/ucc_geth_ethtool.c | 1 | ||||
| -rw-r--r-- | drivers/net/ucc_geth_mii.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index a8994c7b858..64bef7c1236 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c @@ -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) diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c index 5f8c2d30a32..6c257b88ce5 100644 --- a/drivers/net/ucc_geth_mii.c +++ b/drivers/net/ucc_geth_mii.c @@ -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); } |