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, 28 Apr 2010 16:11:53 +1000 [thread overview]
Message-ID: <20100428161153.e683cb12.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/netwave/netwave_cs.c between commit
c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit
3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
trailing whitespace style issue in netwave_cs.c") 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/netwave/netwave_cs.c
index f1ee2cb,7b31621..0000000
--- a/drivers/staging/netwave/netwave_cs.c
+++ b/drivers/staging/netwave/netwave_cs.c
@@@ -377,10 -378,14 +377,10 @@@ static int netwave_probe(struct pcmcia_
/* The io structure describes IO port mapping */
link->io.NumPorts1 = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
- /* link->io.NumPorts2 = 16;
+ /* link->io.NumPorts2 = 16;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_16; */
link->io.IOAddrLines = 5;
-
+
- /* Interrupt setup */
- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
- link->irq.Handler = &netwave_interrupt;
-
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
next reply other threads:[~2010-04-28 6:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 6:11 Stephen Rothwell [this message]
2010-04-28 15:25 ` 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-05-12 6:03 Stephen Rothwell
2010-05-12 19:50 ` 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=20100428161153.e683cb12.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