- rel 4; with 2.6.30 patch

[packages/acx.git] / acx-2.6.24.patch

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;
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 */