diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-08-19 18:03:25 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-08-19 18:03:25 +0000 |
| commit | 5dfe38a35ae56e3d58eb09bbc32a68f674c1aae2 (patch) | |
| tree | 01a5417f6685dfd15c7d130e49fa436b88dd5402 | |
| parent | daf0908d549d226f2aad76bf8882858dd5a99f87 (diff) | |
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.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9167 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 5 | ||||
| -rw-r--r-- | include/dahdi/kernel.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index eefba37..59c667f 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -3724,6 +3724,11 @@ static const struct dahdi_span_ops wctdm24xxp_digital_span_ops = { #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; diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 82adb91..83d3732 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -873,11 +873,6 @@ struct dahdi_span { #endif }; -static inline bool dahdi_is_digital_span(const struct dahdi_span *s) -{ - return (s->linecompat > 0); -} - struct dahdi_transcoder_channel { void *pvt; struct dahdi_transcoder *parent; |