[zaptel-commits] kpfleming: trunk r1768 - in /trunk: ./ xpp/

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Dec 27 16:53:23 2006
New Revision: 1768

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1768
Log:
Merged revisions 1767 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1767 | kpfleming | 2006-12-27 16:49:37 -0600 (Wed, 27 Dec 2006) | 10 lines

Merged revisions 1766 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1766 | kpfleming | 2006-12-27 16:47:19 -0600 (Wed, 27 Dec 2006) | 2 lines

remove pointless duplication of ZAPTEL_VERSION that causes these modules to be rebuilt every time a commit is made to any part of Zaptel

........

................

Modified:
    trunk/   (props changed)
    trunk/xpp/card_fxo.c
    trunk/xpp/card_fxs.c
    trunk/xpp/xpp_usb.c
    trunk/xpp/xpp_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Dec 27 16:53:23 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767

Modified: trunk/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxo.c?view=diff&rev=1768&r1=1767&r2=1768
==============================================================================
--- trunk/xpp/card_fxo.c (original)
+++ trunk/xpp/card_fxo.c Wed Dec 27 16:53:23 2006
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
-#include <version.h>		/* For zaptel version */
 #include "xpd.h"
 #include "xproto.h"
 #include "xpp_zap.h"
@@ -897,7 +896,7 @@
 
 int __init card_fxo_startup(void)
 {
-	INFO("%s revision %s\n", THIS_MODULE->name, ZAPTEL_VERSION);
+	INFO("%s\n", THIS_MODULE->name);
 	xproto_register(&PROTO_TABLE(FXO));
 	return 0;
 }
@@ -910,7 +909,6 @@
 MODULE_DESCRIPTION("XPP FXO Card Driver");
 MODULE_AUTHOR("Oron Peled <oron at actcom.co.il>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ZAPTEL_VERSION);
 MODULE_ALIAS_XPD(XPD_TYPE_FXO);
 
 module_init(card_fxo_startup);

Modified: trunk/xpp/card_fxs.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxs.c?view=diff&rev=1768&r1=1767&r2=1768
==============================================================================
--- trunk/xpp/card_fxs.c (original)
+++ trunk/xpp/card_fxs.c Wed Dec 27 16:53:23 2006
@@ -24,7 +24,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
-#include <version.h>		/* For zaptel version */
 #include "xpd.h"
 #include "xproto.h"
 #include "xpp_zap.h"
@@ -989,7 +988,7 @@
 
 int __init card_fxs_startup(void)
 {
-	INFO("%s revision %s\n", THIS_MODULE->name, ZAPTEL_VERSION);
+	INFO("%s\n", THIS_MODULE->name);
 #ifdef	POLL_DIGITAL_INPUTS
 	INFO("FEATURE: %s with DIGITAL INPUTS support (%s activated)\n",
 			THIS_MODULE->name, (poll_digital_inputs) ? "is" : "is not");
@@ -1008,7 +1007,6 @@
 MODULE_DESCRIPTION("XPP FXS Card Driver");
 MODULE_AUTHOR("Oron Peled <oron at actcom.co.il>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ZAPTEL_VERSION);
 MODULE_ALIAS_XPD(XPD_TYPE_FXS);
 
 module_init(card_fxs_startup);

Modified: trunk/xpp/xpp_usb.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_usb.c?view=diff&rev=1768&r1=1767&r2=1768
==============================================================================
--- trunk/xpp/xpp_usb.c (original)
+++ trunk/xpp/xpp_usb.c Wed Dec 27 16:53:23 2006
@@ -38,7 +38,6 @@
 #include <asm/timex.h>
 #include <linux/proc_fs.h>
 #include <linux/usb.h>
-#include <version.h>		/* For zaptel version */
 #include "xpd.h"
 #include "xproto.h"
 #include "xbus-core.h"
@@ -861,7 +860,7 @@
 	int result;
 	//xusb_t *xusb;
 
-	INFO("%s revision %s\n", THIS_MODULE->name, ZAPTEL_VERSION);
+	INFO("%s\n", THIS_MODULE->name);
 
 	/* register this driver with the USB subsystem */
 	result = usb_register(&xusb_driver);
@@ -942,7 +941,6 @@
 MODULE_DESCRIPTION("XPP USB Driver");
 MODULE_AUTHOR("Oron Peled <oron at actcom.co.il>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ZAPTEL_VERSION);
 
 module_init(xpp_usb_init);
 module_exit(xpp_usb_cleanup);

Modified: trunk/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_zap.c?view=diff&rev=1768&r1=1767&r2=1768
==============================================================================
--- trunk/xpp/xpp_zap.c (original)
+++ trunk/xpp/xpp_zap.c Wed Dec 27 16:53:23 2006
@@ -39,7 +39,6 @@
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
 #include <zaptel.h>
-#include <version.h>		/* For zaptel version */
 #include "xbus-core.h"
 #include "xproto.h"
 #include "xpp_zap.h"
@@ -1448,7 +1447,7 @@
 	int			ret = 0;
 	struct proc_dir_entry	*ent;
 
-	INFO("%s revision %s MAX_XPDS=%d (%d*%d)\n", THIS_MODULE->name, ZAPTEL_VERSION,
+	INFO("%s MAX_XPDS=%d (%d*%d)\n", THIS_MODULE->name,
 			MAX_XPDS, MAX_UNIT, MAX_SUBUNIT);
 #if WITH_ECHO_SUPPRESSION
 	INFO("FEATURE: %s (with ECHO_SUPPRESSION)\n", THIS_MODULE->name);
@@ -1520,7 +1519,6 @@
 MODULE_DESCRIPTION("XPP Zaptel Driver");
 MODULE_AUTHOR("Oron Peled <oron at actcom.co.il>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ZAPTEL_VERSION);
 
 module_init(xpp_zap_init);
 module_exit(xpp_zap_cleanup);