[zaptel-commits] trunk - r910 in /trunk: ./ ztdummy.c

[zaptel-commits at lists.digium.com]

Author: russell
Date: Wed Jan 18 22:34:30 2006
New Revision: 910

URL: http://svn.digium.com/view/zaptel?rev=910&view=rev
Log:
Merged revisions 909 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r909 | russell | 2006-01-18 23:33:13 -0500 (Wed, 18 Jan 2006) | 2 lines

fix symbol conflict with the kernel's rtc_interrupt function (issue #6287)

........

Modified:
    trunk/   (props changed)
    trunk/ztdummy.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 22:34:30 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-879
+/branches/1.2:1-884,886-891,893-906,908-909

Modified: trunk/ztdummy.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdummy.c?rev=910&r1=909&r2=910&view=diff
==============================================================================
--- trunk/ztdummy.c (original)
+++ trunk/ztdummy.c Wed Jan 18 22:34:30 2006
@@ -129,7 +129,7 @@
 #ifdef LINUX26
 #ifdef USE_RTC
 /* rtc_interrupt - called at 1024Hz from hook in RTC handler */
-static void rtc_interrupt(void *private_data)
+static void ztdummy_rtc_interrupt(void *private_data)
 {
 	struct ztdummy *ztd = private_data;
 	unsigned int ticks;
@@ -244,7 +244,7 @@
 #ifdef LINUX26
 #ifdef USE_RTC
     atomic_set(&ztd->ticks, 0);
-    ztd->rtc_task.func = rtc_interrupt;
+    ztd->rtc_task.func = ztdummy_rtc_interrupt;
     ztd->rtc_task.private_data = ztd;
     err = rtc_register(&ztd->rtc_task);
     if (err < 0) {