From: Marc Zyngier <mzyngier@freesurf.fr>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: Linus Torvalds <torvalds@transmeta.com>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.5.59
Date: 17 Jan 2003 11:23:28 +0100 [thread overview]
Message-ID: <wrpel7cxefz.fsf@hina.wild-wind.fr.eu.org> (raw)
In-Reply-To: <20030117095921.GW2333@fs.tum.de>
>>>>> "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.
next prev parent reply other threads:[~2003-01-17 10:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-17 2:28 Linus Torvalds
2003-01-17 4:44 ` William Lee Irwin III
2003-01-17 7:15 ` Udo A. Steinberg
2003-01-17 7:30 ` Udo A. Steinberg
2003-01-17 9:59 ` Adrian Bunk
2003-01-17 10:23 ` Marc Zyngier [this message]
2003-01-17 11:37 ` Adrian Bunk
2003-01-17 16:55 ` John Cherry
2003-01-17 17:10 ` Russell King
2003-01-17 17:10 ` Martin J. Bligh
2003-01-18 4:03 ` Ernst Herzberg
2003-01-20 9:54 ` Christoph Hellwig
2003-01-17 4:06 Carl Gherardi
2003-01-17 4:08 ` Randy.Dunlap
2003-01-17 4:12 ` Kai Germaschewski
2003-01-17 4:16 ` Anders Gustafsson
2003-01-17 4:18 ` Larry McVoy
2003-01-17 4:24 ` Kai Germaschewski
2003-01-17 12:28 ` Geert Uytterhoeven
2003-01-17 16:36 ` Kai Germaschewski
2003-01-17 20:07 ` Sam Ravnborg
2003-01-17 4:17 ` Larry McVoy
2003-01-17 4:20 ` Anders Gustafsson
2003-01-17 4:25 ` Larry McVoy
2003-01-17 5:00 ` Michael D. Shannon
2003-01-17 4:41 ` Joshua Kwan
2003-01-17 9:30 ` David Woodhouse
2003-01-17 4:21 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=wrpel7cxefz.fsf@hina.wild-wind.fr.eu.org \
--to=mzyngier@freesurf.fr \
--cc=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®