aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-22 20:52:12 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-22 20:52:12 +0000
commitc99fbd93f5e977a9c39d21e46b63a4adb730d733 (patch)
tree43e9a63206bc8072a6d0d6b47f6f1af781f13ec2 /target
parentfbc211fc674211d4877f4428565d4a78efa75184 (diff)
downloadupstream-c99fbd93f5e977a9c39d21e46b63a4adb730d733.tar.gz
upstream-c99fbd93f5e977a9c39d21e46b63a4adb730d733.tar.bz2
upstream-c99fbd93f5e977a9c39d21e46b63a4adb730d733.zip
[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 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>");