diff options
| author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-09-30 20:23:06 +0000 |
|---|---|---|
| committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-09-30 20:23:06 +0000 |
| commit | c11e787aa8114fb91797a70e8e89508875c63001 (patch) | |
| tree | ed76310f2b437df96f337bc8636b1dda360b6ceb | |
| parent | 9fd3b447e4025eeba1a0d5126188376848fe3c0c (diff) | |
Removing reference to setup_timer on kernels before 2.6.18.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4549 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | kernel/wctc4xxp/base.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/wctc4xxp/base.c b/kernel/wctc4xxp/base.c index 5bb0da3..0f72511 100644 --- a/kernel/wctc4xxp/base.c +++ b/kernel/wctc4xxp/base.c @@ -3035,7 +3035,14 @@ 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. |