summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-22 20:52:12 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-22 20:52:12 +0000
commitadaf802bbc2eaf6f82e6235df33495f7b2d577d7 (patch)
tree43e9a63206bc8072a6d0d6b47f6f1af781f13ec2 /target
parent5dc7b2bc7224f2dddc0248901777fe6489ca6a85 (diff)
[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
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/drivers/net/phy/micrel.c12
1 files changed, 6 insertions, 6 deletions
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 <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>");