From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexey Dobriyan <adobriyan@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org,
Gertjan van Wingerde <gwingerde@gmail•com>
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Tue, 16 Feb 2010 12:01:03 +1100 [thread overview]
Message-ID: <20100216120103.7128b0f4.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rt2x00/rt2800pci.c between commit
a3aa18842a5303fc28fcc4d57dbd16618bd830a0 ("drivers/net/: use
DEFINE_PCI_DEVICE_TABLE()") from the net tree and commit
de1ebdceb6a4fe1b7073b81d273285b7c8bed312 ("rt2x00: rt2800 - Make rt30xx
and rt35xx chipsets configurable") from the wireless 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/wireless/rt2x00/rt2800pci.c
index d64181c,0e4c417..0000000
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@@ -1190,8 -1184,11 +1184,11 @@@ static const struct rt2x00_ops rt2800pc
/*
* RT2800pci module information.
*/
-static struct pci_device_id rt2800pci_device_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
- { PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) },
+ { PCI_DEVICE(0x1814, 0x0601), PCI_DEVICE_DATA(&rt2800pci_ops) },
+ { PCI_DEVICE(0x1814, 0x0681), PCI_DEVICE_DATA(&rt2800pci_ops) },
+ { PCI_DEVICE(0x1814, 0x0701), PCI_DEVICE_DATA(&rt2800pci_ops) },
+ { PCI_DEVICE(0x1814, 0x0781), PCI_DEVICE_DATA(&rt2800pci_ops) },
{ PCI_DEVICE(0x1432, 0x7708), PCI_DEVICE_DATA(&rt2800pci_ops) },
{ PCI_DEVICE(0x1432, 0x7727), PCI_DEVICE_DATA(&rt2800pci_ops) },
{ PCI_DEVICE(0x1432, 0x7728), PCI_DEVICE_DATA(&rt2800pci_ops) },
next reply other threads:[~2010-02-16 1:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 1:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-12 4:05 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2010-06-04 1:48 Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-06-23 2:51 Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-07-21 2:04 Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2011-06-23 2:47 Stephen Rothwell
2011-08-19 0:59 Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
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=20100216120103.7128b0f4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adobriyan@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=gwingerde@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--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