summaryrefslogtreecommitdiff
path: root/kernel/xpp/xpp_zap.c
diff options
context:
space:
mode:
authormattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-05-16 21:35:06 +0000
committermattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-05-16 21:35:06 +0000
commit5e00740361c43a489bff5d280a80fe7285ea9231 (patch)
treee2776d7eadaa5637a829a7d3549e42a24367b3eb /kernel/xpp/xpp_zap.c
parent8214a17dc5da2b587c0502f10e5d5b0d8e57fbc3 (diff)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4300 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/xpp_zap.c')
-rw-r--r--kernel/xpp/xpp_zap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/xpp/xpp_zap.c b/kernel/xpp/xpp_zap.c
index 5ee7303..69c30f7 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_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_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 ZAPTEL_SYNC_TICK
+#ifdef DAHDI_SYNC_TICK
span->sync_tick = zaptel_sync_tick;
#endif
if (xpp_ec)
span->echocan = xpp_echocan;
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
span->watchdog = xpp_watchdog;
#endif