[svn-commits] sruffell: branch linux/2.5 r10659 - /linux/branches/2.5/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Apr 11 15:19:24 2012
New Revision: 10659

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10659
Log:
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 at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10658

Conflicts:

	drivers/dahdi/xpp/xpp_dahdi.h

Modified:
    linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.c
    linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.h

Modified: linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=10659&r1=10658&r2=10659
==============================================================================
--- linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.c Wed Apr 11 15:19:24 2012
@@ -885,7 +885,7 @@
  * 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 @@
 		DBG(GENERAL, "\n");
 	return 0;
 }
+EXPORT_SYMBOL(xpp_watchdog);
 #endif
 
 /*

Modified: linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.h?view=diff&rev=10659&r1=10658&r2=10659
==============================================================================
--- linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.h (original)
+++ linux/branches/2.5/drivers/dahdi/xpp/xpp_dahdi.h Wed Apr 11 15:19:24 2012
@@ -46,6 +46,7 @@
 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);