[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20091130131630.ad76b951.sfr@canb.auug.org.au>
Date: Mon, 30 Nov 2009 13:16:30 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dominik Brodowski <linux@...inikbrodowski.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Julia Lawall <julia@...u.dk>,
"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the pcmcia tree with the net tree
Hi Dominik,
Today's linux-next merge of the pcmcia tree got conflicts in
drivers/net/pcmcia/fmvj18x_cs.c and drivers/net/pcmcia/nmclan_cs.c
between commit dddcb445a33c80bca11a6566364935e681c85809 ("drivers/net:
remove exceptional & on function name") from the net tree and commit
5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044 ("pcmcia: rework the irq_req_t
typedef") from the pcmcia tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/net/pcmcia/fmvj18x_cs.c
index 57e0961,6e3e1ce..0000000
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@@ -262,10 -255,8 +255,8 @@@ static int fmvj18x_probe(struct pcmcia_
link->io.IOAddrLines = 5;
/* Interrupt setup */
- link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;
- link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
- link->irq.Handler = &fjn_interrupt;
+ link->irq.Handler = fjn_interrupt;
- link->irq.Instance = dev;
/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
diff --cc drivers/net/pcmcia/nmclan_cs.c
index b12e695,dae5ef6..0000000
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@@ -477,10 -463,8 +463,8 @@@ static int nmclan_probe(struct pcmcia_d
link->io.NumPorts1 = 32;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 5;
- link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
- link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
- link->irq.Handler = &mace_interrupt;
+ link->irq.Handler = mace_interrupt;
- link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists