diff options
author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-16 21:39:47 +0000 |
---|---|---|
committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-16 21:39:47 +0000 |
commit | dd3fad8de5df2f25630d66154f209b6b7cbf4049 (patch) | |
tree | ed5c05bf8715f685b46da469d8d7c22cc0d8c0dc /kernel/xpp/xpp_zap.c | |
parent | 5e00740361c43a489bff5d280a80fe7285ea9231 (diff) |
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4301 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/xpp_zap.c')
-rw-r--r-- | kernel/xpp/xpp_zap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c index 69c30f7..5ee7303 100644 --- a/kernel/xpp/xpp_zap.c +++ b/kernel/xpp/xpp_zap.c @@ -828,7 +828,7 @@ int xpp_maint(struct zt_span *span, int cmd) return ret; } -#ifdef CONFIG_DAHDI_WATCHDOG +#ifdef CONFIG_ZAPTEL_WATCHDOG /* * If the watchdog detects no received data, it will call the * watchdog routine @@ -952,12 +952,12 @@ static int zaptel_register_xpd(xpd_t *xpd) */ span->irq = 0; #endif -#ifdef DAHDI_SYNC_TICK +#ifdef ZAPTEL_SYNC_TICK span->sync_tick = zaptel_sync_tick; #endif if (xpp_ec) span->echocan = xpp_echocan; -#ifdef CONFIG_DAHDI_WATCHDOG +#ifdef CONFIG_ZAPTEL_WATCHDOG span->watchdog = xpp_watchdog; #endif |