Prev: linux-next: manual merge of the usb tree with the v4l-dvb tree
Next: AMD IOMMU updates for 2.6.35
From: Stephen Rothwell on 12 May 2010 02:10
Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/wlags49_h2/wl_cs.c between commit
c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit ("") from the
staging-next 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/staging/wlags49_h2/wl_cs.c
index c9d99d8,7c33ead..0000000
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@@ -314,15 -317,15 +314,15 @@@ void wl_adapter_insert( struct pcmcia_d
/* Do we need to allocate an interrupt? */
link->conf.Attributes |= CONF_ENABLE_IRQ;

- CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
- CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
- CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+ // CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
-// CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
++// CS_CHECK(RequestIRQ, pcmcia_request_irq(link, wl_isr));
+ // CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));


- dev->irq = link->irq.AssignedIRQ;
+ dev->irq = link->irq;
dev->base_addr = link->io.BasePort1;

- SET_NETDEV_DEV(dev, &handle_to_dev(link));
+ SET_NETDEV_DEV(dev, &link->dev);
if (register_netdev(dev) != 0) {
printk("%s: register_netdev() failed\n", MODULE_NAME);
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/
 | 
Pages: 1
Prev: linux-next: manual merge of the usb tree with the v4l-dvb tree
Next: AMD IOMMU updates for 2.6.35