summaryrefslogtreecommitdiff
path: root/drivers/dahdi/dahdi_dynamic.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-05-22 12:37:03 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-05-22 12:37:03 +0000
commiteaf5cf5a00d50d816062991f7b4ab39bc3b67caa (patch)
tree213659c16fd571795dbb48c79e59ce59eab74cf1 /drivers/dahdi/dahdi_dynamic.c
parent51d0dce98f109bef2bfa47feb3810c13f97fef13 (diff)
and with another fell swoop... 2.4 kernel support is gone too
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4327 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_dynamic.c')
-rw-r--r--drivers/dahdi/dahdi_dynamic.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c
index c379918..3e913d1 100644
--- a/drivers/dahdi/dahdi_dynamic.c
+++ b/drivers/dahdi/dahdi_dynamic.c
@@ -33,14 +33,11 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
+#include <linux/moduleparam.h>
#include <dahdi/kernel.h>
#include <dahdi/user.h>
-#ifdef LINUX26
-#include <linux/moduleparam.h>
-#endif
-
/*
* Tasklets provide better system interactive response at the cost of the
* possibility of losing a frame of data at very infrequent intervals. If
@@ -515,12 +512,8 @@ static int ztd_open(struct dahdi_chan *chan)
return -ENODEV;
z->usecount++;
}
-#ifndef LINUX26
- MOD_INC_USE_COUNT;
-#else
if(!try_module_get(THIS_MODULE))
printk("TDMoX: Unable to increment module use count\n");
-#endif
return 0;
}
@@ -537,11 +530,7 @@ static int ztd_close(struct dahdi_chan *chan)
z->usecount--;
if (z->dead && !z->usecount)
dynamic_destroy(z);
-#ifndef LINUX26
- MOD_DEC_USE_COUNT;
-#else
module_put(THIS_MODULE);
-#endif
return 0;
}
@@ -851,11 +840,8 @@ void ztdynamic_cleanup(void)
printk("DAHDI Dynamic Span support unloaded\n");
}
-#ifdef LINUX26
module_param(debug, int, 0600);
-#else
-MODULE_PARM(debug, "i");
-#endif
+
MODULE_DESCRIPTION("DAHDI Dynamic Span Support");
MODULE_AUTHOR("Mark Spencer <markster@digium.com>");
#ifdef MODULE_LICENSE