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,
Joe Perches <joe@perches•com>, David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: linux-next: manual merge of the pcmcia tree with the net tree
Date: Thu, 16 Sep 2010 12:31:44 +1000 [thread overview]
Message-ID: <20100916123144.d34aa46f.sfr@canb.auug.org.au> (raw)
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/smc91c92_cs.c between commit
636b8116d4e116eca1ac978f546b16fadfc15a6c ("drivers/net/pcmcia: Use
pr_<level> and netdev_<level>") from the net tree and commit
ba0ff6e64dab1a2492d88fdcc40b4eddabd8b451 ("pcmcia: split up
modify_configuration() into two fixup functions") from the pcmcia tree.
Just context changes. 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/pcmcia/smc91c92_cs.c
index 3d1c549,0af2fc8..0000000
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@@ -819,13 -792,10 +794,10 @@@ static int check_sig(struct pcmcia_devi
}
if (width) {
- modconf_t mod = {
- .Attributes = CONF_IO_CHANGE_WIDTH,
- };
- printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");
+ pr_info("using 8-bit IO window\n");
smc91c92_suspend(link);
- pcmcia_modify_configuration(link, &mod);
+ pcmcia_fixup_iowidth(link);
smc91c92_resume(link);
return check_sig(link);
}
next reply other threads:[~2010-09-16 2:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 2:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-09-16 2:31 linux-next: manual merge of the pcmcia tree with the net tree Stephen Rothwell
2010-04-07 4:17 Stephen Rothwell
2009-12-04 3:53 Stephen Rothwell
2009-11-30 2:16 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=20100916123144.d34aa46f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/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