linux-next: manual merge of the staging-next tree with the pcmcia tree
in [Kernel]
|
Prev: drivers/staging/dt3155: Integrate 3 badly styled files into 1 clean file
Next: linux-next: manual merge of the staging-next tree with the staging.current tree
From: Stephen Rothwell on 28 Apr 2010 02:10 Hi Greg, Today's linux-next merge of the staging-next tree got a conflict in drivers/staging/comedi/drivers/cb_das16_cs.c between commitc 8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi: cb_das16_cs: fixed multiple brace coding style issues") from the staging-next tree. Just context changes. 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/staging/comedi/drivers/cb_das16_cs.c index e0352c6,68bd5ca..0000000 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@@ -175,17 -175,17 +175,17 @@@ static int das16cs_attach(struct comedi printk("I/O base=0x%04lx ", dev->iobase); printk("fingerprint:\n"); - for (i = 0; i < 48; i += 2) { + for (i = 0; i < 48; i += 2) printk("%04x ", inw(dev->iobase + i)); - } + printk("\n"); - ret = request_irq(link->irq.AssignedIRQ, das16cs_interrupt, + ret = request_irq(link->irq, das16cs_interrupt, IRQF_SHARED, "cb_das16_cs", dev); - if (ret < 0) { + if (ret < 0) return ret; - } + - dev->irq = link->irq.AssignedIRQ; + dev->irq = link->irq; printk("irq=%u ", dev->irq); dev->board_ptr = das16cs_probe(dev, link); -- 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/ |