package/acx/patches/005-2.6.30_fixes.patch

   1 diff -urN acx-20080210/pci.c acx-20080210.new/pci.c
   2 --- acx-20080210/pci.c  2009-08-04 00:28:37.000000000 +0200
   3 +++ acx-20080210.new/pci.c      2009-08-04 00:28:42.000000000 +0200
   4 @@ -2005,7 +2005,12 @@
   5         /* then wait until interrupts have finished executing on other CPUs */
   6         acx_lock(adev, flags);
   7         disable_acx_irq(adev);
   8 +#ifdef CONFIG_PCI
   9         synchronize_irq(adev->pdev->irq);
  10 +#endif
  11 +#ifdef CONFIG_VLYNQ
  12 +       synchronize_irq(adev->vdev->irq);
  13 +#endif
  14         acx_unlock(adev, flags);
  15
  16         /* we really don't want to have an asynchronous tasklet disturb us
  17 @@ -4164,7 +4169,11 @@
  18         addr = (u32)ioremap(vdev->mem_start, 0x1000);
  19         if (!addr) {
  20                printk(KERN_ERR "%s: failed to remap io memory\n",
  21 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
  22                       vdev->dev.bus_id);
  23 +#else
  24 +                       dev_name(vdev));
  25 +#endif
  26                result = -ENXIO;
  27                goto fail;
  28         }
  29 @@ -4231,7 +4240,11 @@
  30
  31         printk("acx: found %s-based wireless network card at %s, irq:%d, "
  32               "phymem:0x%x, mem:0x%p\n",
  33 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
  34               match->name, vdev->dev.bus_id, ndev->irq,
  35 +#else
  36 +             match->name, dev_name(vdev), ndev->irq,
  37 +#endif
  38               vdev->mem_start, adev->iobase);
  39         log(L_ANY, "initial debug setting is 0x%04X\n", acx_debug);
  40
  41 diff -urN acx-20080210/wlan_compat.h acx-20080210.new/wlan_compat.h
  42 --- acx-20080210/wlan_compat.h  2008-02-10 21:06:42.000000000 +0100
  43 +++ acx-20080210.new/wlan_compat.h      2009-08-04 00:24:26.000000000 +0200
  44 @@ -221,8 +221,10 @@
  45  #ifndef IRQ_NONE
  46  #define IRQ_NONE
  47  #define IRQ_HANDLED
  48 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
  49  typedef void irqreturn_t;
  50  #endif
  51 +#endif
  52
  53  #ifndef ARPHRD_IEEE80211_PRISM
  54  #define ARPHRD_IEEE80211_PRISM 802