From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 22 Feb 2009 20:52:12 +0000 (+0000)
Subject: micrel phy driver: change initcall level if compiled into the kernel
X-Git-Tag: reboot~24394
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db0a4e48f9b0f3b901d64368fd9dd4e1982aa99b;p=openwrt%2Fstaging%2Fxback.git

micrel phy driver: change initcall level if compiled into the kernel

SVN-Revision: 14628
---

diff --git a/target/linux/ar71xx/files/drivers/net/phy/micrel.c b/target/linux/ar71xx/files/drivers/net/phy/micrel.c
index 6a40cff1cd..bd563437f4 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
@@ -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>");