summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-10-17 17:26:54 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-10-17 17:26:54 +0000
commita85c9cccb57b0337c89c118a54bda6fe6abec722 (patch)
tree207320ddb2c4a39b67cc9bf39b9347e03e71436f /target/linux
parent06b8f376442456d4fe011c3090868864c041aed9 (diff)
[adm5120] fix initcall level in i2c-gpio-custom driver if not built as a module
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9341 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c b/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c
index 9d62a2d909..36a8bf0e37 100644
--- a/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c
+++ b/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c
@@ -144,7 +144,7 @@ err:
return err;
}
-static int __init i2c_gpio_custom_init(void)
+static int __init i2c_gpio_custom_probe(void)
{
int err;
@@ -174,6 +174,12 @@ err:
i2c_gpio_custom_cleanup();
return err;
}
+
+#ifdef MODULE
+static int __init i2c_gpio_custom_init(void)
+{
+ return i2c_gpio_custom_probe();
+}
module_init(i2c_gpio_custom_init);
static void __exit i2c_gpio_custom_exit(void)
@@ -181,10 +187,11 @@ static void __exit i2c_gpio_custom_exit(void)
i2c_gpio_custom_cleanup();
}
module_exit(i2c_gpio_custom_exit);
-
+#else
+subsys_initcall(i2c_gpio_custom_probe);
+#endif /* MODULE*/
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org >");
MODULE_DESCRIPTION(DRV_DESC);
MODULE_VERSION(DRV_VERSION);
-