From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dominik Brodowski <linux@dominikbrodowski•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Kilroy <kilroyd@googlemail•com>,
"John W. Linville" <linville@tuxdriver•com>
Subject: linux-next: manual merge of the pcmcia tree with the wireless tree
Date: Tue, 4 May 2010 13:57:48 +1000 [thread overview]
Message-ID: <20100504135748.10a7cf0e.sfr@canb.auug.org.au> (raw)
Hi Dominik,
Today's linux-next merge of the pcmcia tree got conflicts in
drivers/net/wireless/orinoco/orinoco_cs.c and
drivers/net/wireless/orinoco/spectrum_cs.c between commit
593ef09c9e70c92c0d76c67a1c03a5d44d3aec82 ("orinoco: allow driver to
specify netdev_ops") from the wireless tree and commit
9632b5baa1f857a455a438e5510dc8bb507a85b0 ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/wireless/orinoco/orinoco_cs.c
index f99b13b,03056ab..0000000
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@@ -296,7 -281,7 +281,7 @@@ orinoco_cs_config(struct pcmcia_device
/* Register an interface with the stack */
if (orinoco_if_add(priv, link->io.BasePort1,
- link->irq.AssignedIRQ, NULL) != 0) {
- link->irq) != 0) {
++ link->irq, NULL) != 0) {
printk(KERN_ERR PFX "orinoco_if_add() failed\n");
goto failed;
}
diff --cc drivers/net/wireless/orinoco/spectrum_cs.c
index 9b1af49,41b9ce4..0000000
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@@ -375,7 -359,7 +360,7 @@@ spectrum_cs_config(struct pcmcia_devic
/* Register an interface with the stack */
if (orinoco_if_add(priv, link->io.BasePort1,
- link->irq.AssignedIRQ, NULL) != 0) {
- link->irq) != 0) {
++ link->irq, NULL) != 0) {
printk(KERN_ERR PFX "orinoco_if_add() failed\n");
goto failed;
}
next reply other threads:[~2010-05-04 3:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 3:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-11-11 4:33 linux-next: manual merge of the pcmcia tree with the wireless tree Stephen Rothwell
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=20100504135748.10a7cf0e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kilroyd@googlemail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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