Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 196664
Collapse All | Expand All

(-)file_not_specified_in_diff (-3 / +11 lines)
Line  Link Here
0
-- acx-20080112/pci.c.orig 
0
++ acx-20080112/pci.c 
Lines 1632-1639 Link Here
1632
	acx_show_card_eeprom_id(adev);
1632
	acx_show_card_eeprom_id(adev);
1633
#endif /* NONESSENTIAL_FEATURES */
1633
#endif /* NONESSENTIAL_FEATURES */
1634
1634
1635
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
1635
#ifdef SET_MODULE_OWNER
1636
#ifdef SET_MODULE_OWNER
1636
	SET_MODULE_OWNER(ndev);
1637
 	SET_MODULE_OWNER(ndev);
1638
#endif
1637
#endif
1639
#endif
1638
	SET_NETDEV_DEV(ndev, &pdev->dev);
1640
	SET_NETDEV_DEV(ndev, &pdev->dev);
1639
1641
Lines 2128-2134 Link Here
2128
/* TODO: pci_set_power_state(pdev, PCI_D0); ? */
2130
/* TODO: pci_set_power_state(pdev, PCI_D0); ? */
2129
2131
2130
	/* request shared IRQ handler */
2132
	/* request shared IRQ handler */
2133
	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))	
2134
		if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) {
2135
	#else
2131
	if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) {
2136
	if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) {
2137
	#endif		
2132
		printk("%s: request_irq FAILED\n", ndev->name);
2138
		printk("%s: request_irq FAILED\n", ndev->name);
2133
		result = -EAGAIN;
2139
		result = -EAGAIN;
2134
		goto done;
2140
		goto done;
2135
-- acx-20080112/usb.c.orig
2141
++ acx-20080112/usb.c
Lines 859-865 Link Here
859
	ndev->watchdog_timeo = 4 * HZ;
859
	ndev->watchdog_timeo = 4 * HZ;
860
#endif
860
#endif
861
	ndev->change_mtu = &acx_e_change_mtu;
861
	ndev->change_mtu = &acx_e_change_mtu;
862
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
862
	SET_MODULE_OWNER(ndev);
863
	SET_MODULE_OWNER(ndev);
864
#endif
863
865
864
	/* Setup private driver context */
866
	/* Setup private driver context */
865
867

Return to bug 196664