From c49961d9c0691b944137854e8e8f167485a758ba Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 11 Apr 2012 20:19:29 +0000 Subject: 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 Acked-by: Tzafrir Cohen Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10658 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.6@10660 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/xpp/xpp_dahdi.c | 3 ++- drivers/dahdi/xpp/xpp_dahdi.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 1bfed84..b9fa49a 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -834,7 +834,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; @@ -842,6 +842,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 f7a0092..0dd11c9 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.h +++ b/drivers/dahdi/xpp/xpp_dahdi.h @@ -47,6 +47,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 xpp_span_assigned(struct dahdi_span *span); void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd); int total_registered_spans(void); -- cgit v1.2.3