[svn-commits] sruffell: linux/trunk r9167 - in /linux/trunk: drivers/dahdi/wctdm24xxp/ incl...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Aug 19 13:03:25 2010
New Revision: 9167

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9167
Log:
dahdi: move 'dahdi_is_digital_span' back into wctdm24xp driver.

Older kernels do not like the 'bool' type and I cannot just add it into
include/dahdi/kernel.h without compile messages in the xpp driver where bool
is defined directly.  Since the wctdm24xxp driver is the only place using that
function, I just moved it back there for now.  This fixes a regression
introduced in 9130.

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9167&r1=9166&r2=9167
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Aug 19 13:03:25 2010
@@ -3724,6 +3724,11 @@
 #endif
 };
 
+static inline bool dahdi_is_digital_span(const struct dahdi_span *s)
+{
+	return (s->linecompat > 0);
+}
+
 static struct wctdm_chan *wctdm_init_chan(struct wctdm *wc, struct wctdm_span *s, int chanoffset, int channo)
 {
 	struct wctdm_chan *c;

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9167&r1=9166&r2=9167
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Thu Aug 19 13:03:25 2010
@@ -872,11 +872,6 @@
 	int watchstate;
 #endif	
 };
-
-static inline bool dahdi_is_digital_span(const struct dahdi_span *s)
-{
-	return (s->linecompat > 0);
-}
 
 struct dahdi_transcoder_channel {
 	void *pvt;