From d653250809bfefc4427705e3d9fe45c54586ccf3 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Fri, 20 Jun 2008 22:40:11 +0000 Subject: merge modular_ec branch, which adds modular echocan support and lots of minor fixes and improvements... seems to work properly, except the usecount on the echocan modules never increments above zero, so they are unloadable when they should not be git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4436 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi_dynamic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/dahdi/dahdi_dynamic.c') diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 577b5d7..f29bbda 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -626,7 +626,7 @@ static int create_dynamic(DAHDI_DYNAMIC_SPAN *zds) /* Try loading the right module */ char fn[80]; spin_unlock_irqrestore(&dlock, flags); - sprintf(fn, "ztd-%s", zds->driver); + sprintf(fn, "dahdi_dynamic_%s", zds->driver); request_module(fn); spin_lock_irqsave(&dlock, flags); ztd = find_driver(zds->driver); @@ -844,9 +844,7 @@ module_param(debug, int, 0600); MODULE_DESCRIPTION("DAHDI Dynamic Span Support"); MODULE_AUTHOR("Mark Spencer "); -#ifdef MODULE_LICENSE -MODULE_LICENSE("GPL"); -#endif +MODULE_LICENSE("GPL v2"); module_init(ztdynamic_init); module_exit(ztdynamic_cleanup); -- cgit v1.2.3