[Pkg-voip-commits] r6015 - in /misdn-kernel/trunk/debian: changelog patches/fix_gt_2.6.18 patches/series

maniac-guest at alioth.debian.org maniac-guest at alioth.debian.org
Mon Aug 4 06:20:52 UTC 2008


Author: maniac-guest
Date: Mon Aug  4 06:20:52 2008
New Revision: 6015

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6015
Log:
added patch to fix builds with kernels > 2.6.18

Added:
    misdn-kernel/trunk/debian/patches/fix_gt_2.6.18
Modified:
    misdn-kernel/trunk/debian/changelog
    misdn-kernel/trunk/debian/patches/series

Modified: misdn-kernel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/changelog?rev=6015&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/changelog (original)
+++ misdn-kernel/trunk/debian/changelog Mon Aug  4 06:20:52 2008
@@ -8,6 +8,7 @@
   * patches unapplied. 
      hfcmulti_c90
      hfcmulti_bigendian
+  * added patch to fix builds with kernels > 2.6.18
 
  -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 04 Jun 2008 19:31:22 +0200
 

Added: misdn-kernel/trunk/debian/patches/fix_gt_2.6.18
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/patches/fix_gt_2.6.18?rev=6015&op=file
==============================================================================
--- misdn-kernel/trunk/debian/patches/fix_gt_2.6.18 (added)
+++ misdn-kernel/trunk/debian/patches/fix_gt_2.6.18 Mon Aug  4 06:20:52 2008
@@ -1,0 +1,98 @@
+--- a/drivers/isdn/hardware/mISDN/avm_fritz.c
++++ b/drivers/isdn/hardware/mISDN/avm_fritz.c
+@@ -876,7 +876,7 @@ reset_avmpcipnp(fritzpnppci *fc)
+ static int init_card(fritzpnppci *fc)
+ {
+ 	int		cnt = 3;
+-	u_int		shared = SA_SHIRQ;
++	u_int		shared = IRQF_SHARED;
+ 	u_long		flags;
+ 	u_char		*id = "AVM Fritz!PCI";
+ 
+--- a/drivers/isdn/hardware/mISDN/core.h
++++ b/drivers/isdn/hardware/mISDN/core.h
+@@ -32,6 +32,9 @@
+ #define DEBUG_SYSFS		0x4000
+ #define DEBUG_THREADS		0x8000
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++#define IRQF_SHARED                    SA_SHIRQ
++#endif /* < 2.6.18 */
+ 
+ /* from udevice.c */
+ extern int		init_mISDNdev(int);
+--- a/drivers/isdn/hardware/mISDN/hfc_multi.c
++++ b/drivers/isdn/hardware/mISDN/hfc_multi.c
+@@ -119,7 +119,7 @@
+ #define bugtest \
+ 	if (hc->irq) free_irq(hc->irq, hc); \
+ 	hc->irq = 0; \
+-	if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { \
++	if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, IRQF_SHARED, "HFC-multi", hc)) { \
+ 		printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); \
+ 	hc->irq = hc->pci_dev->irq; }
+ #endif
+@@ -3299,7 +3299,7 @@ init_card(hfc_multi_t *hc)
+ 	disable_hwirq(hc);
+ 	spin_unlock_irqrestore(&hc->lock, flags);
+ 
+-	if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) {
++	if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, IRQF_SHARED, "HFC-multi", hc)) {
+ 		printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq);
+ 		return(-EIO);
+ 	}
+--- a/drivers/isdn/hardware/mISDN/hfc_pci.c
++++ b/drivers/isdn/hardware/mISDN/hfc_pci.c
+@@ -1693,7 +1693,7 @@ static int init_card(hfc_pci_t *hc)
+ 	spin_lock_irqsave(&hc->lock, flags);
+ 	disable_hwirq(hc);
+ 	spin_unlock_irqrestore(&hc->lock, flags);
+-	if (request_irq(hc->irq, hfcpci_interrupt, SA_SHIRQ, "HFC PCI", hc)) {
++	if (request_irq(hc->irq, hfcpci_interrupt, IRQF_SHARED, "HFC PCI", hc)) {
+ 		printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", hc->irq);
+ 		return(-EIO);
+ 	}
+--- a/drivers/isdn/hardware/mISDN/hfcs_mini.c
++++ b/drivers/isdn/hardware/mISDN/hfcs_mini.c
+@@ -1587,7 +1587,7 @@ setup_instance(hfcsmini_hw * hw)
+ 		printk(KERN_WARNING "%s %s: requesting IRQ %d\n",
+ 		       hw->card_name, __FUNCTION__, hw->irq);
+ 		       
+-	if (request_irq(hw->irq, hfcsmini_interrupt, SA_SHIRQ, "HFC-S mini", hw)) {
++	if (request_irq(hw->irq, hfcsmini_interrupt, IRQF_SHARED, "HFC-S mini", hw)) {
+ 		printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n",
+ 		       hw->card_name, __FUNCTION__, hw->irq);
+ 		       
+--- a/drivers/isdn/hardware/mISDN/netjet.c
++++ b/drivers/isdn/hardware/mISDN/netjet.c
+@@ -1544,7 +1544,7 @@ nj_init_card (netjet_t *card)
+ 	nj_disable_hwirq(card);
+ 	spin_unlock_irqrestore(&card->lock, flags);
+ 
+-	if (request_irq(card->irq, nj_interrupt, SA_SHIRQ, "NETjet", card)) {
++	if (request_irq(card->irq, nj_interrupt, IRQF_SHARED, "NETjet", card)) {
+ 		printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n",
+ 		       card->irq);
+ 		return (-EIO);
+--- a/drivers/isdn/hardware/mISDN/sedl_fax.c
++++ b/drivers/isdn/hardware/mISDN/sedl_fax.c
+@@ -338,7 +338,7 @@ static int init_card(sedl_fax *sf)
+ {
+ 	int	cnt = 3;
+ 	u_long	flags;
+-	u_int	shared = SA_SHIRQ;
++	u_int	shared = IRQF_SHARED;
+ 	void	*irq_func = speedfax_pci_interrupt;
+ 
+ 	if (sf->subtyp == SEDL_SPEEDFAX_ISA) {
+--- a/drivers/isdn/hardware/mISDN/xhfc_su.c
++++ b/drivers/isdn/hardware/mISDN/xhfc_su.c
+@@ -2031,7 +2031,7 @@ xhfc_pci_probe(struct pci_dev *pdev, con
+ 	}
+ 
+ 	/* init interrupt engine */
+-	if (request_irq(pi->irq, xhfc_interrupt, SA_SHIRQ, "XHFC", pi)) {
++	if (request_irq(pi->irq, xhfc_interrupt, IRQF_SHARED, "XHFC", pi)) {
+ 		printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n",
+ 		       pi->name, __FUNCTION__, pi->irq);
+ 		pi->irq = 0;

Modified: misdn-kernel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/trunk/debian/patches/series?rev=6015&op=diff
==============================================================================
--- misdn-kernel/trunk/debian/patches/series (original)
+++ misdn-kernel/trunk/debian/patches/series Mon Aug  4 06:20:52 2008
@@ -2,3 +2,4 @@
 #hfcmulti_bigendian
 perms_dev_mISDN
 misdnversion
+fix_gt_2.6.18




More information about the Pkg-voip-commits mailing list