Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Subject | Re: Linux 2.5.59 | From | Marc Zyngier <> | Date | 17 Jan 2003 11:23:28 +0100 |
| |
>>>>> "Adrian" == Adrian Bunk <bunk@fs.tum.de> writes:
Adrian> On Thu, Jan 16, 2003 at 06:28:03PM -0800, Linus Torvalds wrote: >> ... >> o EISA sysfs updates to 3c509 and 3c59x drivers >> ...
Adrian> This change browke the compilation of 3c509 with CONFIG_PM:
Can you try this patch (compiles, but otherwise untested) ?
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 11:17:18 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; } @@ -597,6 +587,16 @@ lp->pnpdev = idev; #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); } -- Places change, faces change. Life is so very strange. - 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/
| ![\](/images/icornerr.gif) |