X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Fmicrel.c;h=bd563437f4b0dfdbfb77aba4c0c0cd882eae3fb6;hb=be73e0d6a71e594bd9522560b434d0edcde9c7f1;hp=e6516729f62ff487d1b4345ae90d1e4a749f0a3e;hpb=546b5ed544503182a9b3e981bc11feebd6042b21;p=openwrt-10.03%2F.git

diff --git a/target/linux/ar71xx/files/drivers/net/phy/micrel.c b/target/linux/ar71xx/files/drivers/net/phy/micrel.c
index e6516729f..bd563437f 100644
--- a/target/linux/ar71xx/files/drivers/net/phy/micrel.c
+++ b/target/linux/ar71xx/files/drivers/net/phy/micrel.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for Micrel/Kendin PHYs
  *
- *  Copyright (c) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (c) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ static int ksz8041_config_intr(struct phy_device *phydev)
 
 static struct phy_driver ksz8041_phy_driver = {
 	.phy_id		= 0x00221512,
-	.name		= "Micrel/Kendin KSZ8041",
+	.name		= "Micrel KSZ8041",
 	.phy_id_mask	= 0x001fffff,
 	.features	= PHY_BASIC_FEATURES,
 	.flags		= PHY_HAS_INTERRUPT,
@@ -61,11 +61,7 @@ static struct phy_driver ksz8041_phy_driver = {
 
 static int __init micrel_phy_init(void)
 {
-	int ret;
-
-	ret = phy_driver_register(&ksz8041_phy_driver);
-
-	return ret;
+	return phy_driver_register(&ksz8041_phy_driver);
 }
 
 static void __exit micrel_phy_exit(void)
@@ -73,8 +69,12 @@ static void __exit micrel_phy_exit(void)
 	phy_driver_unregister(&ksz8041_phy_driver);
 }
 
+#ifdef MODULE
 module_init(micrel_phy_init);
 module_exit(micrel_phy_exit);
+#else
+subsys_initcall(micrel_phy_init);
+#endif
 
 MODULE_DESCRIPTION("Micrel/Kendin PHY driver");
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");