diff options
| author | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-01-19 04:34:30 +0000 |
|---|---|---|
| committer | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-01-19 04:34:30 +0000 |
| commit | a20dc9e85ba19a60cab4dae235c4f7ed9e7d1117 (patch) | |
| tree | 3aefa8ef0551f1373f3265b582924704929aea8a /ztdummy.c | |
| parent | 7008a739e643b5363e4091bc4a2d16ef0889e527 (diff) | |
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
Diffstat (limited to 'ztdummy.c')
| -rw-r--r-- | ztdummy.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) { |