summaryrefslogtreecommitdiff
path: root/kernel/zaptel.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/zaptel.h')
-rw-r--r--kernel/zaptel.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/zaptel.h b/kernel/zaptel.h
index 81f7946..04ae820 100644
--- a/kernel/zaptel.h
+++ b/kernel/zaptel.h
@@ -25,8 +25,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef _LINUX_ZAPTEL_H
-#define _LINUX_ZAPTEL_H
+#ifndef _LINUX_DAHDI_H
+#define _LINUX_DAHDI_H
#ifdef __KERNEL__
#include "zconfig.h"
@@ -1634,7 +1634,7 @@ struct zt_span {
/* Opt: Enable maintenance modes */
int (*maint)(struct zt_span *span, int mode);
-#ifdef ZAPTEL_SYNC_TICK
+#ifdef DAHDI_SYNC_TICK
/* Opt: send sync to spans */
int (*sync_tick)(struct zt_span *span, int is_master);
#endif
@@ -1694,7 +1694,7 @@ struct zt_span {
/* If the watchdog detects no received data, it will call the
watchdog routine */
int (*watchdog)(struct zt_span *span, int cause);
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
int watchcounter;
int watchstate;
#endif
@@ -1842,7 +1842,7 @@ struct zt_tone *zt_mf_tone(const struct zt_chan *chan, char digit, int digitmode
/* Echo cancel a receive and transmit chunk for a given channel. This
should be called by the low-level driver as close to the interface
as possible. ECHO CANCELLATION IS NO LONGER AUTOMATICALLY DONE
- AT THE ZAPTEL LEVEL. zt_ec_chunk will not echo cancel if it should
+ AT THE DAHDI LEVEL. zt_ec_chunk will not echo cancel if it should
not be doing so. rxchunk is modified in-place */
void zt_ec_chunk(struct zt_chan *chan, unsigned char *rxchunk, const unsigned char *txchunk);
@@ -2104,4 +2104,4 @@ static inline void zap_copy_string(char *dst, const char *src, unsigned int size
*dst = '\0';
}
-#endif /* _LINUX_ZAPTEL_H */
+#endif /* _LINUX_DAHDI_H */