[GIT PATCH] ucc_geth fixes for 2.6.22-rc1

[GIT PATCH] ucc_geth fixes for 2.6.22-rc1

[Li Yang]

Please pull from 'ucc_geth' branch of
master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc.git ucc_geth

to receive the following fixes:

 drivers/net/ucc_geth_ethtool.c |    1 -
 drivers/net/ucc_geth_mii.c     |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

Domen Puncer (1):
      ucc_geth: fix section mismatch

Jan Altenberg (1):
      ucc_geth: remove get_perm_addr from ucc_geth_ethtool.c


diff --git a/drivers/net/ucc_geth_ethtool.c
b/drivers/net/ucc_geth_ethtool.c
index a8994c7..64bef7c 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 5f8c2d3..6c257b8 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);
 }

Re: [GIT PATCH] ucc_geth fixes for 2.6.22-rc1

[Jeff Garzik]

Li Yang wrote:
> Please pull from 'ucc_geth' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/leo/fsl-soc.git ucc_geth
> 
> to receive the following fixes:
> 
>  drivers/net/ucc_geth_ethtool.c |    1 -
>  drivers/net/ucc_geth_mii.c     |    3 ++-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Domen Puncer (1):
>       ucc_geth: fix section mismatch
> 
> Jan Altenberg (1):
>       ucc_geth: remove get_perm_addr from ucc_geth_ethtool.c

pulled