diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-02 13:02:29 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-02 13:02:29 +0000 |
commit | ef05eedbe6bffbdaaee55f26b0c54a06fd32b6f2 (patch) | |
tree | 9ad41b5d77c42f6b5cf7397f4a9005a7a5483024 | |
parent | 8eebe3930583371de9d168b500e67e8d230d1aaa (diff) |
Remove unneeded case for #ifdef DAHDI_SPANSTAT_V2 -
this is always the case for dahdi.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4509 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxo.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxs.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_pri.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 66ce51e..5d479fd 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -673,9 +673,7 @@ static int BRI_card_dahdi_preregistration(xpd_t *xpd, bool on) /* Nothing to do yet */ return 0; } -#ifdef DAHDI_SPANSTAT_V2 xpd->span.spantype = "BRI"; -#endif xpd->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; xpd->span.deflaw = DAHDI_LAW_ALAW; BIT_SET(xpd->digital_signalling, 2); /* D-Channel */ diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index 5091dcf..96e528c 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -500,9 +500,7 @@ static int FXO_card_dahdi_preregistration(xpd_t *xpd, bool on) priv = xpd->priv; BUG_ON(!priv); XPD_DBG(GENERAL, xpd, "%s\n", (on)?"ON":"OFF"); -#ifdef DAHDI_SPANSTAT_V2 xpd->span.spantype = "FXO"; -#endif for_each_line(xpd, i) { struct dahdi_chan *cur_chan = &xpd->chans[i]; diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index d17571b..ac89204 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -477,9 +477,7 @@ static int FXS_card_dahdi_preregistration(xpd_t *xpd, bool on) priv = xpd->priv; BUG_ON(!priv); XPD_DBG(GENERAL, xpd, "%s\n", (on)?"on":"off"); -#ifdef DAHDI_SPANSTAT_V2 xpd->span.spantype = "FXS"; -#endif for_each_line(xpd, i) { struct dahdi_chan *cur_chan = &xpd->chans[i]; diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index 551da79..7eb6a58 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -885,9 +885,7 @@ static int PRI_card_dahdi_preregistration(xpd_t *xpd, bool on) /* Nothing to do yet */ return 0; } -#ifdef DAHDI_SPANSTAT_V2 xpd->span.spantype = pri_protocol_name(priv->pri_protocol); -#endif xpd->span.linecompat = pri_linecompat(priv->pri_protocol); xpd->span.deflaw = priv->deflaw; for_each_line(xpd, i) { diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index ae8e381..a8fbfee 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -918,7 +918,6 @@ static int dahdi_register_xpd(xpd_t *xpd) span->hooksig = xpp_hooksig; /* Only with RBS bits */ span->ioctl = xpp_ioctl; span->maint = xpp_maint; -#ifdef DAHDI_SPANSTAT_V2 /* * This actually describe the dahdi_spaninfo version 3 * A bunch of unrelated data exported via a modified ioctl() @@ -951,7 +950,6 @@ static int dahdi_register_xpd(xpd_t *xpd) * No irq's for you today! */ span->irq = 0; -#endif #ifdef DAHDI_SYNC_TICK span->sync_tick = dahdi_sync_tick; #endif |