From 2ec923262d529e9c35b5335a4ba9cb414abfa245 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 11 Apr 2012 20:09:44 +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 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10658 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 d2a5503..fd9c51a 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -877,7 +877,7 @@ EXPORT_SYMBOL(xpp_maint); * 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; @@ -885,6 +885,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 6e2578f..ab7df50 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.h +++ b/drivers/dahdi/xpp/xpp_dahdi.h @@ -49,6 +49,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