[Pkg-voip-commits] r8090 - /dahdi-linux/trunk/debian/patches/no_dummy

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Feb 18 11:38:09 2010
New Revision: 8090

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8090
Log:
It seems that the no_dummy patch requires actively removing dahdi_dummy.

Modified:
    dahdi-linux/trunk/debian/patches/no_dummy

Modified: dahdi-linux/trunk/debian/patches/no_dummy
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_dummy?rev=8090&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_dummy (original)
+++ dahdi-linux/trunk/debian/patches/no_dummy Thu Feb 18 11:38:09 2010
@@ -7,7 +7,8 @@
 loading of dahdi_dummy in the dahdi init script (thus avoidng extra
 dummy span that messes configurations).
 
-Should be forwarded upstream pending testing.
+Should be forwarded upstream pending testing. Also note it conflicts
+with the dahdi_extra patch (in the Kbuild file).
 
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
@@ -32,3 +33,13 @@
  
  /* 
   * Uncomment if you happen have an early TDM400P Rev H which 
+--- a/drivers/dahdi/Kbuild
++++ b/drivers/dahdi/Kbuild
+@@ -1,6 +1,6 @@
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI)			+= dahdi.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200)		+= opvxa1200.o
+-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY)		+= dahdi_dummy.o
++#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY)		+= dahdi_dummy.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCOPENPCI)		+= wcopenpci.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC)		+= dahdi_dynamic.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ZAPHFC)		+= zaphfc/