Merged revisions 865 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r865 | kpfleming | 2005-12-16 20:04:05 -0600 (Fri, 16 Dec 2005) | 3 lines

add version and echo canceller selection reporting when zaptel module is loaded
make 'update' target work like the Asterisk one and report conflicts

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@866 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 6 insertions, 0 deletions

diff --git a/zaptel.c b/zaptel.c
index 4d23dae..4cc996d 100644
--- a/zaptel.c
+++ b/zaptel.c
@@ -38,6 +38,7 @@
 
 
 #include "zconfig.h"
+#include "version.h"
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -6422,6 +6423,9 @@ MODULE_DESCRIPTION("Zapata Telephony Interface");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+#ifdef MODULE_VERSION
+MODULE_VERSION(ZAPTEL_VERSION);
+#endif
 
 #ifdef LINUX26
 module_param(debug, int, 0600);
@@ -6540,6 +6544,8 @@ static int __init zt_init(void) {
 #endif /* CONFIG_DEVFS_FS */
 
 	printk(KERN_INFO "Zapata Telephony Interface Registered on major %d\n", ZT_MAJOR);
+	printk(KERN_INFO "Zaptel Version: %s Echo Canceller: %s\n", ZAPTEL_VERSION,
+	       ZAPTEL_ECHO_CANCELLER ZAPTEL_ECHO_AGGRESSIVE);
 	zt_conv_init();
 	tone_zone_init();
 	fasthdlc_precalc();