diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2012-04-11 20:19:24 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2012-04-11 20:19:24 +0000 |
| commit | 537c8dd79f12a5b2946382fba470ca0b55177a30 (patch) | |
| tree | 062308c67ade265fee13e31c90a900af3c254e31 | |
| parent | 9dcacd42beef2933ef6ea34782fb89ecae21035f (diff) | |
xpp: Fix compilation when CONFIG_DAHDI_WATCHDOG is defined.
Looks like a hold over from when dahdi_span_ops was first implemented in r8985
"dahdi: Move the callbacks in dahdi_span into its own structure" [1].
[1] http://svnview.digium.com/svn/dahdi?view=revision&revision=8985
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10658
Conflicts:
drivers/dahdi/xpp/xpp_dahdi.h
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10659 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 3 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 42e19e0..e88abf3 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -885,7 +885,7 @@ int xpp_maint(struct dahdi_span *span, int cmd) * If the watchdog detects no received data, it will call the * watchdog routine */ -static int xpp_watchdog(struct dahdi_span *span, int cause) +int xpp_watchdog(struct dahdi_span *span, int cause) { static int rate_limit = 0; @@ -893,6 +893,7 @@ static int xpp_watchdog(struct dahdi_span *span, int cause) DBG(GENERAL, "\n"); return 0; } +EXPORT_SYMBOL(xpp_watchdog); #endif /* diff --git a/drivers/dahdi/xpp/xpp_dahdi.h b/drivers/dahdi/xpp/xpp_dahdi.h index 01f4a24..23a8862 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.h +++ b/drivers/dahdi/xpp/xpp_dahdi.h @@ -46,6 +46,7 @@ int xpp_close(struct dahdi_chan *chan); int xpp_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long arg); int xpp_hooksig(struct dahdi_chan *chan, enum dahdi_txsig txsig); int xpp_maint(struct dahdi_span *span, int cmd); +int xpp_watchdog(struct dahdi_span *span, int cause); void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd); int total_registered_spans(void); void oht_pcm(xpd_t *xpd, int pos, bool pass); |