diff options
| -rw-r--r-- | package/acx/Makefile | 4 | ||||
| -rw-r--r-- | package/acx/patches/001-build-fix.diff | 12 | ||||
| -rw-r--r-- | package/acx/patches/003-2.6.24-compat.diff | 42 |
3 files changed, 2 insertions, 56 deletions
diff --git a/package/acx/Makefile b/package/acx/Makefile index 216df5f44..c61bf2d92 100644 --- a/package/acx/Makefile +++ b/package/acx/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=acx -PKG_VERSION:=20080112 +PKG_VERSION:=20080210 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/acx100 -PKG_MD5SUM:=b376b5359ef15da589ef17387a6b37d3 +PKG_MD5SUM:=7d5ce3215708e4e9f95cf567a9ee3a12 PKG_FW_NAME:=tiacx111c16 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/ diff --git a/package/acx/patches/001-build-fix.diff b/package/acx/patches/001-build-fix.diff deleted file mode 100644 index b21893fc8..000000000 --- a/package/acx/patches/001-build-fix.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 20080112/pci.c 2008/01/12 12:16:53 8 -+++ 20080112/pci.c 2008/01/12 20:10:36 9 -@@ -2060,7 +2060,7 @@ - /* then wait until interrupts have finished executing on other CPUs */ - acx_lock(adev, flags); - disable_acx_irq(adev); -- synchronize_irq(adev->irq); -+ synchronize_irq(adev->pdev->irq); - acx_unlock(adev, flags); - - /* we really don't want to have an asynchronous tasklet disturb us - diff --git a/package/acx/patches/003-2.6.24-compat.diff b/package/acx/patches/003-2.6.24-compat.diff deleted file mode 100644 index c216dd145..000000000 --- a/package/acx/patches/003-2.6.24-compat.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -u acx-20080112/pci.c acx-20080112.new/pci.c ---- acx-20080112/pci.c 2008-02-08 19:20:41.000000000 +0000 -+++ acx-20080112.new/pci.c 2008-02-08 19:05:46.000000000 +0000 -@@ -1632,7 +1632,7 @@ - acx_show_card_eeprom_id(adev); - #endif /* NONESSENTIAL_FEATURES */ - --#ifdef SET_MODULE_OWNER -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER) - SET_MODULE_OWNER(ndev); - #endif - SET_NETDEV_DEV(ndev, &pdev->dev); -@@ -2128,7 +2128,7 @@ - /* TODO: pci_set_power_state(pdev, PCI_D0); ? */ - - /* request shared IRQ handler */ -- if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) { -+ if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) { - printk("%s: request_irq FAILED\n", ndev->name); - result = -EAGAIN; - goto done; -@@ -4339,7 +4339,7 @@ - acx_show_card_eeprom_id(adev); - #endif /* NONESSENTIAL_FEATURES */ - --#ifdef SET_MODULE_OWNER -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER) - SET_MODULE_OWNER(ndev); - #endif - SET_NETDEV_DEV(ndev, adev->bus_dev); -diff -u acx-20080112/usb.c acx-20080112.new/usb.c ---- acx-20080112/usb.c 2008-01-12 12:27:38.000000000 +0000 -+++ acx-20080112.new/usb.c 2008-02-08 19:01:34.000000000 +0000 -@@ -859,7 +859,9 @@ - ndev->watchdog_timeo = 4 * HZ; - #endif - ndev->change_mtu = &acx_e_change_mtu; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - SET_MODULE_OWNER(ndev); -+#endif - - /* Setup private driver context */ |