* linux-next: manual merge of the pcmcia tree with the wireless tree
@ 2009-11-11 4:33 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2009-11-11 4:33 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, Julia Lawall, John W. Linville
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/wireless/ray_cs.c between commit
40cca2919c1994c01addfac2320ee77f4b9e12cf ("drivers/net/wireless: correct
check on CCS_START_NETWORK") from the wireless tree and commit
624dd66957e53e15cf40e937b50597c4d41f0e99 ("pcmcia: use dynamic debug
infrastructure, deprecate CS_CHECK (ray-cs.c)") 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/wireless/ray_cs.c
index 5ee9d2a,28db791..0000000
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@@ -2074,8 -2065,8 +2065,8 @@@ static irqreturn_t ray_interrupt(int ir
del_timer(&local->timer);
local->timer.expires = jiffies + HZ * 5;
local->timer.data = (long)local;
- if (status == CCS_START_NETWORK) {
+ if (cmd == CCS_START_NETWORK) {
- DEBUG(0,
+ dev_dbg(&link->dev,
"ray_cs interrupt network \"%s\" start failed\n",
local->sparm.b4.a_current_ess_id);
local->timer.function = &start_net;
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the pcmcia tree with the wireless tree
@ 2010-05-04 3:57 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2010-05-04 3:57 UTC (permalink / raw)
To: Dominik Brodowski
Cc: linux-next, linux-kernel, David Kilroy, John W. Linville
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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-04 3:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-11 4:33 linux-next: manual merge of the pcmcia tree with the wireless tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-05-04 3:57 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox