linux-next: manual merge of the pcmcia tree with the wireless tree
in [Kernel]
|
Prev: [PATCH 1/3] lockdep: Provide off case for redundant_hardirqs_on increment
Next: Flash IO slow 1.5 MB/s
From: Stephen Rothwell on 4 May 2010 00:00 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(a)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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |