[dahdi-commits] sruffell: linux/trunk r10061 - /linux/trunk/drivers/dahdi/wct4xxp/base.c

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Jul 20 12:24:31 2011
New Revision: 10061

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10061
Log:
wct4xxp: Fix compilation when VPM_SUPPORT is not defined.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10061&r1=10060&r2=10061
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Wed Jul 20 12:24:31 2011
@@ -244,9 +244,11 @@
 #define CANARY 0xc0de
 
 /* names of available HWEC modules */
+#ifdef VPM_SUPPORT
 static const char *vpm400_name = "VPM400M";
 static const char *vpmoct064_name = "VPMOCT064";
 static const char *vpmoct128_name = "VPMOCT128";
+#endif
 
 #define PORTS_PER_FRAMER 4
 
@@ -2032,6 +2034,7 @@
 		ts = wc->tspans[x];
 		strlcpy(ts->span.devicetype, wc->variety,
 			sizeof(ts->span.devicetype));
+#ifdef VPM_SUPPORT
 		if (wc->vpm == T4_VPM_PRESENT) {
 			if (!wc->vpm450m)
 				strncat(ts->span.devicetype, " (VPM400M)", sizeof(ts->span.devicetype) - 1);
@@ -2039,6 +2042,7 @@
 				strncat(ts->span.devicetype, (wc->numspans > 2) ? " (VPMOCT128)" : " (VPMOCT064)",
 					sizeof(ts->span.devicetype) - 1);
 		}
+#endif
 	}
 }
 
@@ -4015,6 +4019,7 @@
 			t4_framer_interrupt(wc, 3);
 	}
 
+#ifdef VPM_SUPPORT
 	if (wc->vpm && vpmdtmfsupport) {
 		if (wc->vpm450m) {
 			/* How stupid is it that the octasic can't generate an
@@ -4028,6 +4033,7 @@
 			set_bit(T4_CHECK_VPM, &wc->checkflag);
 		}
 	}
+#endif
 
 	spin_lock(&wc->reglock);
 
@@ -4919,10 +4925,12 @@
 	/* Stop hardware */
 	t4_hardware_stop(wc);
 	
+#ifdef VPM_SUPPORT
 	/* Release vpm450m */
 	if (wc->vpm450m)
 		release_vpm450m(wc->vpm450m);
 	wc->vpm450m = NULL;
+#endif
 	/* Unregister spans */
 
 	basesize = DAHDI_MAX_CHUNKSIZE * 32 * 4;