diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
| commit | d653250809bfefc4427705e3d9fe45c54586ccf3 (patch) | |
| tree | 8b22eb3a57540633e0f0c783a8a9c79e7d49bd9e /drivers/dahdi/dahdi_transcode.c | |
| parent | a8cc1e7138795a0ea33afea701317c1d6054a84d (diff) | |
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
Diffstat (limited to 'drivers/dahdi/dahdi_transcode.c')
| -rw-r--r-- | drivers/dahdi/dahdi_transcode.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c index df11dce..31352ef 100644 --- a/drivers/dahdi/dahdi_transcode.c +++ b/drivers/dahdi/dahdi_transcode.c @@ -441,7 +441,7 @@ static struct dahdi_chardev transcode_chardev = { .minor = 250, }; -int zttranscode_init(void) +int dahdi_transcode_init(void) { int res; @@ -460,7 +460,7 @@ int zttranscode_init(void) return 0; } -void zttranscode_cleanup(void) +void dahdi_transcode_cleanup(void) { dahdi_unregister_chardev(&transcode_chardev); @@ -473,9 +473,7 @@ module_param(debug, int, S_IRUGO | S_IWUSR); MODULE_DESCRIPTION("DAHDI Transcoder Support"); MODULE_AUTHOR("Mark Spencer <markster@digium.com>"); -#ifdef MODULE_LICENSE -MODULE_LICENSE("GPL"); -#endif +MODULE_LICENSE("GPL v2"); -module_init(zttranscode_init); -module_exit(zttranscode_cleanup); +module_init(dahdi_transcode_init); +module_exit(dahdi_transcode_cleanup); |