lkml.org 
[lkml]   [2003]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: 2.5.59 fails compile 3c509.c
Date
Quoting Marc Zyngier
>
> Could you please try the following patch ?
>
> Thanks,
>
> M.
>
> ===== drivers/net/3c509.c 1.30 vs edited =====
> --- 1.30/drivers/net/3c509.c Wed Jan 15 11:07:35 2003
> +++ edited/drivers/net/3c509.c Fri Jan 17 15:26:30 2003
> @@ -319,16 +319,6 @@
> dev->watchdog_timeo = TX_TIMEOUT;
> dev->do_ioctl = netdev_ioctl;
>
> -#ifdef CONFIG_PM
> - /* register power management */
> - lp->pmdev = pm_register(PM_ISA_DEV, card_idx, el3_pm_callback);
> - if (lp->pmdev) {
> - struct pm_dev *p;
> - p = lp->pmdev;
> - p->data = (struct net_device *)dev;
> - }
> -#endif
> -
> return 0;
> }
>
> @@ -598,6 +588,16 @@
> #endif
> lp->mca_slot = mca_slot;
>
> +#ifdef CONFIG_PM
> + /* register power management */
> + lp->pmdev = pm_register(PM_ISA_DEV, card_idx, el3_pm_callback);
> + if (lp->pmdev) {
> + struct pm_dev *p;
> + p = lp->pmdev;
> + p->data = (struct net_device *)dev;
> + }
> +#endif
> +
> return el3_common_init (dev);
> }
>
> @@ -1080,12 +1080,14 @@
> free_irq(dev->irq, dev);
> /* Switching back to window 0 disables the IRQ. */
> EL3WINDOW(0);
> +#ifdef CONFIG_EISA
> if (!lp->edev) {
> /* But we explicitly zero the IRQ line select anyway. Don't do
> * it on EISA cards, it prevents the module from getting an
> * IRQ after unload+reload... */
> outw(0x0f00, ioaddr + WN0_IRQ);
> }
> +#endif
>
> return 0;
> }
>
> --
> Places change, faces change. Life is so very strange.
>

Patch fixes the compile problem.
--
Pete Clements
clem@clem.clem-digital.net
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:32    [W:0.066 / U:3.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site