Subject: linux-next: manual merge of the staging-next tree with the pcmcia tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 28 Apr 2010 16:11:53 +1000

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/netwave/netwave_cs.c between commit
c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
pcmcia_request_irq()") from the pcmcia tree and commit
3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
trailing whitespace style issue in netwave_cs.c") from the staging-next
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/staging/netwave/netwave_cs.c
index f1ee2cb,7b31621..0000000
--- a/drivers/staging/netwave/netwave_cs.c
+++ b/drivers/staging/netwave/netwave_cs.c
@@@ -377,10 -378,14 +377,10 @@@ static int netwave_probe(struct pcmcia_
      /* The io structure describes IO port mapping */
      link->io.NumPorts1 = 16;
      link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-     /* link->io.NumPorts2 = 16; 
+     /* link->io.NumPorts2 = 16;
         link->io.Attributes2 = IO_DATA_PATH_WIDTH_16; */
      link->io.IOAddrLines = 5;
-     
+ 
 -    /* Interrupt setup */
 -    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
 -    link->irq.Handler = &netwave_interrupt;
 -
      /* General socket configuration */
      link->conf.Attributes = CONF_ENABLE_IRQ;
      link->conf.IntType = INT_MEMORY_AND_IO;