From: juhosg Date: Sun, 22 Feb 2009 20:52:12 +0000 (+0000) Subject: [ar71xx] micrel phy driver: change initcall level if compiled into the kernel X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/adaf802bbc2eaf6f82e6235df33495f7b2d577d7 [ar71xx] micrel phy driver: change initcall level if compiled into the kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14628 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/ar71xx/files/drivers/net/phy/micrel.c b/target/linux/ar71xx/files/drivers/net/phy/micrel.c index 6a40cff1c..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 + * Copyright (c) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * 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 ");