[Pkg-voip-commits] r7630 - in /dahdi-linux/trunk/debian/patches: mmx_auto no_firmware_download wcfxo_reset_fix

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Fri Sep 25 10:21:56 2009
New Revision: 7630

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7630
Log:
Refresh dahdi-linux patches

Modified:
    dahdi-linux/trunk/debian/patches/mmx_auto
    dahdi-linux/trunk/debian/patches/no_firmware_download
    dahdi-linux/trunk/debian/patches/wcfxo_reset_fix

Modified: dahdi-linux/trunk/debian/patches/mmx_auto
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/mmx_auto?rev=7630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/mmx_auto (original)
+++ dahdi-linux/trunk/debian/patches/mmx_auto Fri Sep 25 10:21:56 2009
@@ -3,11 +3,9 @@
 
 Patch dahdi_mmx_auto.diff from http://bugs.digium.com/view.php?id=13500
 
-Index: drivers/dahdi/Kbuild
-===================================================================
---- a/drivers/dahdi/Kbuild	(revision 6418)
-+++ b/drivers/dahdi/Kbuild	(working copy)
-@@ -100,3 +100,25 @@ $(obj)/makefw: $(src)/makefw.c
+--- a/drivers/dahdi/Kbuild
++++ b/drivers/dahdi/Kbuild
+@@ -134,3 +134,25 @@ $(obj)/makefw: $(src)/makefw.c
  	$(HOSTCC) -o $@ $^
  
  clean-files	:= radfw.h tor2fw.h
@@ -18,7 +16,7 @@
 +DAHDI_MMX_WHITELIST_i386 = M586MMX M686 MPENTIUMII MPENTIUMIII MPENTIUMM \
 +			   MPENTIUM4 MVIAC3_2 MVIAC3_2 MK7 MK8
 +
-+DAHDI_MMX_WHITELIST_x86_64 = 
++DAHDI_MMX_WHITELIST_x86_64 =
 +
 +# A list of configuration variables to test: CONFIG_M686 , etc.
 +DAHDI_MMX_CONFIG_VARS := $(DAHDI_MMX_WHITELIST_$(ARCH):%=CONFIG_%)

Modified: dahdi-linux/trunk/debian/patches/no_firmware_download
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_firmware_download?rev=7630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_firmware_download (original)
+++ dahdi-linux/trunk/debian/patches/no_firmware_download Fri Sep 25 10:21:56 2009
@@ -10,7 +10,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -98,7 +98,7 @@ include/dahdi/version.h: FORCE
+@@ -88,7 +88,7 @@ include/dahdi/version.h: FORCE
  	fi
  	@rm -f $@.tmp
  

Modified: dahdi-linux/trunk/debian/patches/wcfxo_reset_fix
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/wcfxo_reset_fix?rev=7630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/wcfxo_reset_fix (original)
+++ dahdi-linux/trunk/debian/patches/wcfxo_reset_fix Fri Sep 25 10:21:56 2009
@@ -14,11 +14,9 @@
 
 To be included in dahdi-linux 2.3 .
 
-diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
-index 69b42a0..5e61edb 100644
 --- a/drivers/dahdi/wcfxo.c
 +++ b/drivers/dahdi/wcfxo.c
-@@ -674,6 +674,16 @@ static int wcfxo_hardware_init(struct wcfxo *wc)
+@@ -673,6 +673,16 @@ static int wcfxo_hardware_init(struct wc
  	/* Hardware stuff */
  	/* Reset PCI Interface chip and registers */
  	outb(0x0e, wc->ioaddr + WC_CNTL);
@@ -35,7 +33,7 @@
  	if (wc->flags & FLAG_RESET_ON_AUX5) {
  		/* Set hook state to on hook for when we switch.
  		   Make sure reset is high */
-@@ -682,8 +692,6 @@ static int wcfxo_hardware_init(struct wcfxo *wc)
+@@ -681,8 +691,6 @@ static int wcfxo_hardware_init(struct wc
  		/* Set hook state to on hook for when we switch */
  		outb(0x24, wc->ioaddr + WC_AUXD);
  	}