summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2008-09-06 20:24:59 +0000
committerMatthew Fredrickson <creslin@digium.com>2008-09-06 20:24:59 +0000
commit0bd5988710a3398100289df3eaee6cb90e5d86d7 (patch)
treedf2c1b491ce68ca9337fd2e064e4503dcbd0812e
parent15200b498525b042565d0b9ac3f70d24ca29622c (diff)
Fix class_simple on old 2.6.9 kernels
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4868 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/dahdi-base.c3
-rw-r--r--drivers/dahdi/wct4xxp/base.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 5dcfdb5..014c1e3 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -175,6 +175,9 @@ static struct proc_dir_entry *proc_entries[DAHDI_MAX_SPANS];
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
#define CLASS_DEV_DESTROY(class, devt) \
class_device_destroy(class, devt)
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) \
+#define CLASS_DEV_DESTROY(class, devt) \
+ class_simple_device_remove(devt)
#else
#define CLASS_DEV_DESTROY(class, devt) \
class_simple_device_remove(class, devt)
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index d3d2577..b40853f 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -184,7 +184,7 @@ static int lastdtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD;
utilization / max number of calls / etc. */
static int noburst = 1;
/* For 56kbps links, set this module parameter to 0x7f */
-static int hardhdlcmode = 0xff;
+static int hardhdlcmode = 0x7f;
#ifdef FANCY_ALARM
static int altab[] = {