From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dominik Brodowski <linux@dominikbrodowski•net>
Subject: linux-next: manual merge of the staging-next tree with the pcmcia tree
Date: Wed, 12 May 2010 16:03:52 +1000 [thread overview]
Message-ID: <20100512160352.daa747f8.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/wlags49_h2/wl_cs.c between commit
c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit ("") from the
staging-next 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/staging/wlags49_h2/wl_cs.c
index c9d99d8,7c33ead..0000000
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -314,15 -317,15 +314,15 @@@ void wl_adapter_insert( struct pcmcia_d
/* Do we need to allocate an interrupt? */
link->conf.Attributes |= CONF_ENABLE_IRQ;
- CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
- CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
- CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+ // CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-// CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
++// CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
+ // CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
- dev->irq = link->irq.AssignedIRQ;
+ dev->irq = link->irq;
dev->base_addr = link->io.BasePort1;
- SET_NETDEV_DEV(dev, &handle_to_dev(link));
+ SET_NETDEV_DEV(dev, &link->dev);
if (register_netdev(dev) != 0) {
printk("%s: register_netdev() failed\n", MODULE_NAME);
goto failed;
next reply other threads:[~2010-05-12 6:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 6:03 Stephen Rothwell [this message]
2010-05-12 19:50 ` linux-next: manual merge of the staging-next tree with the pcmcia tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2010-08-02 3:57 Stephen Rothwell
2010-08-02 22:23 ` Greg KH
2010-08-02 3:57 Stephen Rothwell
2010-08-02 22:23 ` Greg KH
2010-05-17 5:49 Stephen Rothwell
2010-05-17 18:01 ` Greg KH
2010-04-28 6:11 Stephen Rothwell
2010-04-28 15:25 ` Greg KH
2010-04-28 6:07 Stephen Rothwell
2010-04-28 15:26 ` Greg KH
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=20100512160352.daa747f8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
/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