[Pkg-voip-commits] r10346 - in /dahdi-linux/trunk/debian/patches: dahdi_linux_extra hotplug_mod_params notest pciradio-request_firmware tor2-request_firmware

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Mon Dec 9 20:37:22 UTC 2013 

Author: tzafrir
Date: Mon Dec  9 20:37:22 2013
New Revision: 10346

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

Modified:
    dahdi-linux/trunk/debian/patches/dahdi_linux_extra
    dahdi-linux/trunk/debian/patches/hotplug_mod_params
    dahdi-linux/trunk/debian/patches/notest
    dahdi-linux/trunk/debian/patches/pciradio-request_firmware
    dahdi-linux/trunk/debian/patches/tor2-request_firmware

Modified: dahdi-linux/trunk/debian/patches/dahdi_linux_extra
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/dahdi_linux_extra?rev=10346&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra	(original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra	Mon Dec  9 20:37:22 2013
@@ -10,11 +10,9 @@
 Git-Commit: 65d0c3f161befe261c86d6cadc6a23986c8d09ad
 Dahdi: v2.7.0-rc1
 ---
-diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
-index 5450dff..6d426df 100644
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -39,6 +39,14 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2)	+= dahdi_echocan_sec2.o
+@@ -56,6 +56,14 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECH
  obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1)	+= dahdi_echocan_kb1.o
  obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2)	+= dahdi_echocan_mg2.o
  
@@ -29,8 +27,6 @@
  obj-m += $(DAHDI_MODULES_EXTRA)
  
  # If you want to build OSLEC, include the code in the standard location:
-diff --git a/drivers/dahdi/Kconfig b/drivers/dahdi/Kconfig
-index 6952c6a..4275775 100644
 --- a/drivers/dahdi/Kconfig
 +++ b/drivers/dahdi/Kconfig
 @@ -292,3 +292,89 @@ config DAHDI_WCTE11XP
@@ -123,9 +119,6 @@
 +
 +	  If unsure, say Y.
 +
-diff --git a/drivers/dahdi/ap400/Kbuild b/drivers/dahdi/ap400/Kbuild
-new file mode 100644
-index 0000000..d124261
 --- /dev/null
 +++ b/drivers/dahdi/ap400/Kbuild
 @@ -0,0 +1,26 @@
@@ -155,9 +148,6 @@
 +$(src)/../firmware/make_firmware_object:
 +	make -C $(src)/../firmware make_firmware_object
 +
-diff --git a/drivers/dahdi/ap400/ap400.h b/drivers/dahdi/ap400/ap400.h
-new file mode 100644
-index 0000000..ba233d1
 --- /dev/null
 +++ b/drivers/dahdi/ap400/ap400.h
 @@ -0,0 +1,107 @@
@@ -268,9 +258,6 @@
 +	AP_PULS_DS1_M225DB
 +} liu_mode;
 +
-diff --git a/drivers/dahdi/ap400/ap400_drv.c b/drivers/dahdi/ap400/ap400_drv.c
-new file mode 100644
-index 0000000..092aefb
 --- /dev/null
 +++ b/drivers/dahdi/ap400/ap400_drv.c
 @@ -0,0 +1,2337 @@
@@ -2611,9 +2598,6 @@
 +
 +module_init(ap4_init);
 +module_exit(ap4_cleanup);
-diff --git a/drivers/dahdi/ap400/apec.c b/drivers/dahdi/ap400/apec.c
-new file mode 100644
-index 0000000..b43655e
 --- /dev/null
 +++ b/drivers/dahdi/ap400/apec.c
 @@ -0,0 +1,390 @@
@@ -3007,9 +2991,6 @@
 +	kfree(apec);
 +	printk(KERN_INFO "APEC: Releasing...\n");
 +}
-diff --git a/drivers/dahdi/ap400/apec.h b/drivers/dahdi/ap400/apec.h
-new file mode 100644
-index 0000000..483b182
 --- /dev/null
 +++ b/drivers/dahdi/ap400/apec.h
 @@ -0,0 +1,48 @@
@@ -3061,9 +3042,6 @@
 +void apec_release(struct apec_s *instance);
 +
 +#endif /*_APEC_H_*/
-diff --git a/drivers/dahdi/opvxa1200/Kbuild b/drivers/dahdi/opvxa1200/Kbuild
-new file mode 100644
-index 0000000..8f90819
 --- /dev/null
 +++ b/drivers/dahdi/opvxa1200/Kbuild
 @@ -0,0 +1,19 @@
@@ -3086,9 +3064,6 @@
 +                endif
 +        endif
 +endif
-diff --git a/drivers/dahdi/opvxa1200/Makefile b/drivers/dahdi/opvxa1200/Makefile
-new file mode 100644
-index 0000000..baaab35
 --- /dev/null
 +++ b/drivers/dahdi/opvxa1200/Makefile
 @@ -0,0 +1,8 @@
@@ -3100,9 +3075,6 @@
 +
 +else
 +endif
-diff --git a/drivers/dahdi/opvxa1200/base.c b/drivers/dahdi/opvxa1200/base.c
-new file mode 100644
-index 0000000..25ce3c4
 --- /dev/null
 +++ b/drivers/dahdi/opvxa1200/base.c
 @@ -0,0 +1,3065 @@
@@ -6171,9 +6143,6 @@
 +
 +module_init(wctdm_init);
 +module_exit(wctdm_cleanup);
-diff --git a/drivers/dahdi/opvxd115/Kbuild b/drivers/dahdi/opvxd115/Kbuild
-new file mode 100644
-index 0000000..474997d
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/Kbuild
 @@ -0,0 +1,32 @@
@@ -6209,9 +6178,6 @@
 +
 +$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-032.o: $(obj)/base.o
 +	$(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-032.o
-diff --git a/drivers/dahdi/opvxd115/Makefile b/drivers/dahdi/opvxd115/Makefile
-new file mode 100644
-index 0000000..baaab35
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/Makefile
 @@ -0,0 +1,8 @@
@@ -6223,9 +6189,6 @@
 +
 +else
 +endif
-diff --git a/drivers/dahdi/opvxd115/base.c b/drivers/dahdi/opvxd115/base.c
-new file mode 100644
-index 0000000..8ef1796
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/base.c
 @@ -0,0 +1,4908 @@
@@ -11137,9 +11100,6 @@
 +
 +module_init(t4_init);
 +module_exit(t4_cleanup);
-diff --git a/drivers/dahdi/opvxd115/opvxd115-diag.c b/drivers/dahdi/opvxd115/opvxd115-diag.c
-new file mode 100644
-index 0000000..7d1dfdb
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/opvxd115-diag.c
 @@ -0,0 +1,427 @@
@@ -11570,9 +11530,6 @@
 +	}
 +	exit(0);
 +}
-diff --git a/drivers/dahdi/opvxd115/opvxd115.h b/drivers/dahdi/opvxd115/opvxd115.h
-new file mode 100644
-index 0000000..d89d5b3
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/opvxd115.h
 @@ -0,0 +1,124 @@
@@ -11700,9 +11657,6 @@
 +
 +#define WCT4_GET_REGS	_IOW (DAHDI_CODE, 60, struct t4_regs)
 +
-diff --git a/drivers/dahdi/opvxd115/vpm450m.c b/drivers/dahdi/opvxd115/vpm450m.c
-new file mode 100644
-index 0000000..f1ed421
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/vpm450m.c
 @@ -0,0 +1,587 @@
@@ -12293,9 +12247,6 @@
 +	vfree(vpm450m->pApiInstance);
 +	kfree(vpm450m);
 +}
-diff --git a/drivers/dahdi/opvxd115/vpm450m.h b/drivers/dahdi/opvxd115/vpm450m.h
-new file mode 100644
-index 0000000..735a2cc
 --- /dev/null
 +++ b/drivers/dahdi/opvxd115/vpm450m.h
 @@ -0,0 +1,43 @@
@@ -12342,9 +12293,6 @@
 +void release_vpm450m(struct vpm450m *instance);
 +
 +#endif
-diff --git a/drivers/dahdi/wcopenpci.c b/drivers/dahdi/wcopenpci.c
-new file mode 100644
-index 0000000..d7fbc2d
 --- /dev/null
 +++ b/drivers/dahdi/wcopenpci.c
 @@ -0,0 +1,1784 @@
@@ -14132,9 +14080,6 @@
 +MODULE_AUTHOR(DRIVER_AUTHOR);
 +MODULE_VERSION(DAHDI_VERSION);
 +MODULE_LICENSE("GPL");
-diff --git a/drivers/dahdi/zaphfc/Kbuild b/drivers/dahdi/zaphfc/Kbuild
-new file mode 100644
-index 0000000..960fb3a
 --- /dev/null
 +++ b/drivers/dahdi/zaphfc/Kbuild
 @@ -0,0 +1,10 @@
@@ -14148,9 +14093,6 @@
 +$(obj)/fifo.o: $(src)/fifo.h
 +
 +
-diff --git a/drivers/dahdi/zaphfc/base.c b/drivers/dahdi/zaphfc/base.c
-new file mode 100644
-index 0000000..a7bf9b1
 --- /dev/null
 +++ b/drivers/dahdi/zaphfc/base.c
 @@ -0,0 +1,1720 @@
@@ -15874,9 +15816,6 @@
 +#ifdef DEBUG
 +MODULE_PARM_DESC(debug_level, "Debug verbosity level");
 +#endif
-diff --git a/drivers/dahdi/zaphfc/fifo.c b/drivers/dahdi/zaphfc/fifo.c
-new file mode 100644
-index 0000000..8c23fa3
 --- /dev/null
 +++ b/drivers/dahdi/zaphfc/fifo.c
 @@ -0,0 +1,375 @@
@@ -16255,9 +16194,6 @@
 +	}
 +}
 +
-diff --git a/drivers/dahdi/zaphfc/fifo.h b/drivers/dahdi/zaphfc/fifo.h
-new file mode 100644
-index 0000000..1866f30
 --- /dev/null
 +++ b/drivers/dahdi/zaphfc/fifo.h
 @@ -0,0 +1,139 @@
@@ -16400,9 +16336,6 @@
 +void hfc_clear_fifo_tx(struct hfc_chan_simplex *chan);
 +
 +#endif
-diff --git a/drivers/dahdi/zaphfc/zaphfc.h b/drivers/dahdi/zaphfc/zaphfc.h
-new file mode 100644
-index 0000000..d3cceef
 --- /dev/null
 +++ b/drivers/dahdi/zaphfc/zaphfc.h
 @@ -0,0 +1,419 @@
@@ -16825,9 +16758,6 @@
 +}
 +
 +#endif
-diff --git a/drivers/staging/echo/Kbuild b/drivers/staging/echo/Kbuild
-new file mode 100644
-index 0000000..f813006
 --- /dev/null
 +++ b/drivers/staging/echo/Kbuild
 @@ -0,0 +1,6 @@
@@ -16837,9 +16767,6 @@
 +
 +# An explicit 'obj-m' , unlike the Makefile
 +obj-m += echo.o
-diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c
-new file mode 100644
-index 0000000..4cc4f2e
 --- /dev/null
 +++ b/drivers/staging/echo/echo.c
 @@ -0,0 +1,662 @@
@@ -17505,9 +17432,6 @@
 +MODULE_AUTHOR("David Rowe");
 +MODULE_DESCRIPTION("Open Source Line Echo Canceller");
 +MODULE_VERSION("0.3.0");
-diff --git a/drivers/staging/echo/echo.h b/drivers/staging/echo/echo.h
-new file mode 100644
-index 0000000..754e66d
 --- /dev/null
 +++ b/drivers/staging/echo/echo.h
 @@ -0,0 +1,175 @@
@@ -17686,9 +17610,6 @@
 +};
 +
 +#endif /* __ECHO_H */
-diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h
-new file mode 100644
-index 0000000..288bffc
 --- /dev/null
 +++ b/drivers/staging/echo/fir.h
 @@ -0,0 +1,286 @@
@@ -17978,9 +17899,6 @@
 +}
 +
 +#endif
-diff --git a/drivers/staging/echo/mmx.h b/drivers/staging/echo/mmx.h
-new file mode 100644
-index 0000000..c030cdf
 --- /dev/null
 +++ b/drivers/staging/echo/mmx.h
 @@ -0,0 +1,288 @@
@@ -18272,9 +18190,6 @@
 +
 +
 +#endif /* AVCODEC_I386MMX_H */
-diff --git a/drivers/staging/echo/oslec.h b/drivers/staging/echo/oslec.h
-new file mode 100644
-index 0000000..f417536
 --- /dev/null
 +++ b/drivers/staging/echo/oslec.h
 @@ -0,0 +1,94 @@

Modified: dahdi-linux/trunk/debian/patches/hotplug_mod_params
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/hotplug_mod_params?rev=10346&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/hotplug_mod_params	(original)
+++ dahdi-linux/trunk/debian/patches/hotplug_mod_params	Mon Dec  9 20:37:22 2013
@@ -6,7 +6,7 @@
 
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
-@@ -7327,7 +7327,7 @@ int dahdi_assign_device_spans(struct dah
+@@ -7369,7 +7369,7 @@ int dahdi_assign_device_spans(struct dah
  	return 0;
  }
  

Modified: dahdi-linux/trunk/debian/patches/notest
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/notest?rev=10346&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/notest	(original)
+++ dahdi-linux/trunk/debian/patches/notest	Mon Dec  9 20:37:22 2013
@@ -3,7 +3,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -206,9 +206,6 @@ dist-clean: clean
+@@ -190,9 +190,6 @@ dist-clean: clean
  firmware-download:
  	@$(MAKE) -C drivers/dahdi/firmware all
  

Modified: dahdi-linux/trunk/debian/patches/pciradio-request_firmware
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/pciradio-request_firmware?rev=10346&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/pciradio-request_firmware	(original)
+++ dahdi-linux/trunk/debian/patches/pciradio-request_firmware	Mon Dec  9 20:37:22 2013
@@ -121,7 +121,7 @@
  
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -141,11 +141,4 @@ ifeq ($(HPEC_PRESENT),yes)
+@@ -166,11 +166,4 @@ ifeq ($(HPEC_PRESENT),yes)
  obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC)	+= dahdi_echocan_hpec.o
  endif
  

Modified: dahdi-linux/trunk/debian/patches/tor2-request_firmware
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/tor2-request_firmware?rev=10346&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/tor2-request_firmware	(original)
+++ dahdi-linux/trunk/debian/patches/tor2-request_firmware	Mon Dec  9 20:37:22 2013
@@ -69,7 +69,7 @@
  err_out_release_plx_region:
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -142,14 +142,10 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECH
+@@ -167,14 +167,10 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECH
  endif
  
  $(obj)/pciradio.o: $(obj)/radfw.h

More information about the Pkg-voip-commits mailing list