[svn-commits] sruffell: linux/trunk r7096 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Sep  7 16:40:25 2009
New Revision: 7096

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=7096
Log:
dahdi-base: Prevent compilation if both EMPULSE and EMFLASH are defined.

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

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=7096&r1=7095&r2=7096
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Sep  7 16:40:25 2009
@@ -76,6 +76,10 @@
 #endif
 
 #include "hpec/hpec_user.h"
+
+#if defined(EMPULSE) && defined(EMFLASH)
+#error "You cannot define both EMPULSE and EMFLASH"
+#endif
 
 /* Get helper arithmetic */
 #include "arith.h"