prepare 2.6.24 on ixp4xx
[openwrt/openwrt.git] / package / acx / patches / 003-2.6.24-compat.diff
1 diff -u acx-20080112/pci.c acx-20080112.new/pci.c
2 --- acx-20080112/pci.c 2008-02-08 19:20:41.000000000 +0000
3 +++ acx-20080112.new/pci.c 2008-02-08 19:05:46.000000000 +0000
4 @@ -1632,7 +1632,7 @@
5 acx_show_card_eeprom_id(adev);
6 #endif /* NONESSENTIAL_FEATURES */
7
8 -#ifdef SET_MODULE_OWNER
9 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
10 SET_MODULE_OWNER(ndev);
11 #endif
12 SET_NETDEV_DEV(ndev, &pdev->dev);
13 @@ -2128,7 +2128,7 @@
14 /* TODO: pci_set_power_state(pdev, PCI_D0); ? */
15
16 /* request shared IRQ handler */
17 - if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) {
18 + if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) {
19 printk("%s: request_irq FAILED\n", ndev->name);
20 result = -EAGAIN;
21 goto done;
22 @@ -4339,7 +4339,7 @@
23 acx_show_card_eeprom_id(adev);
24 #endif /* NONESSENTIAL_FEATURES */
25
26 -#ifdef SET_MODULE_OWNER
27 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
28 SET_MODULE_OWNER(ndev);
29 #endif
30 SET_NETDEV_DEV(ndev, adev->bus_dev);
31 diff -u acx-20080112/usb.c acx-20080112.new/usb.c
32 --- acx-20080112/usb.c 2008-01-12 12:27:38.000000000 +0000
33 +++ acx-20080112.new/usb.c 2008-02-08 19:01:34.000000000 +0000
34 @@ -859,7 +859,9 @@
35 ndev->watchdog_timeo = 4 * HZ;
36 #endif
37 ndev->change_mtu = &acx_e_change_mtu;
38 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
39 SET_MODULE_OWNER(ndev);
40 +#endif
41
42 /* Setup private driver context */