From a20dc9e85ba19a60cab4dae235c4f7ed9e7d1117 Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 19 Jan 2006 04:34:30 +0000 Subject: 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) ........ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@910 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- ztdummy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ztdummy.c') diff --git a/ztdummy.c b/ztdummy.c index 9d10b99..df2f19b 100644 --- a/ztdummy.c +++ b/ztdummy.c @@ -129,7 +129,7 @@ extern uhci_t **uhci_devices; #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 @@ int init_module(void) #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) { -- cgit v1.2.3