summaryrefslogtreecommitdiff
path: root/drivers/dahdi/wctc4xxp
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2008-09-30 20:29:59 +0000
committerShaun Ruffell <sruffell@digium.com>2008-09-30 20:29:59 +0000
commita9ef1d6f921870ea97e2ee20718ba824b676828e (patch)
tree3284dcf0866132bf25c10364050a733e6df3aaca /drivers/dahdi/wctc4xxp
parent14bc121eb2db53ef28cee245e8e625022b4405d0 (diff)
Removing references to setup_timer in pre 2.6.18 kernels.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5017 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctc4xxp')
-rw-r--r--drivers/dahdi/wctc4xxp/base.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index 1fb3bbb..96fe265 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -3035,7 +3035,13 @@ wctc4xxp_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
}
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ wc->watchdog.function = wctc4xxp_watchdog;
+ wc->watchdog.data = (unsigned long)wc;
+ init_timer(&wc->watchdog);
+# else
setup_timer(&wc->watchdog, wctc4xxp_watchdog, (unsigned long)wc);
+# endif
/* ------------------------------------------------------------------
* Load the firmware and start the DTE.