| Message ID | 1386543229-1542-5-git-send-email-ynvich@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/08/2013 11:53 PM, Sergei Ianovich wrote: > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > CC: Daniel Mack <zonque@gmail.com> > --- > arch/arm/mach-pxa/irq.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c > index b6cc181..432842c 100644 > --- a/arch/arm/mach-pxa/irq.c > +++ b/arch/arm/mach-pxa/irq.c > @@ -236,7 +236,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)) > { > struct device_node *node; > const struct of_device_id *of_id; > - struct pxa_intc_conf *conf; > struct resource res; > int n, ret; > > @@ -246,7 +245,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)) > return; > } > of_id = of_match_node(intc_ids, node); > - conf = of_id->data; A similar patch was already merged by Haojian recently. You should probably rebase your patch stack on top of his maintainer tree. Daniel
On Mon, 2013-12-09 at 09:56 +0100, Daniel Mack wrote: > A similar patch was already merged by Haojian recently. You should > probably rebase your patch stack on top of his maintainer tree. I've just come across the patch you mention in the arm mailing list. Could you please provide a link to Haojian's official public repository? If possible, a link link to your repository will also be very helpful. My tree is at https://github.com/yanovich/linux
On 12/09/2013 10:42 AM, Sergei Ianovich wrote: > On Mon, 2013-12-09 at 09:56 +0100, Daniel Mack wrote: >> A similar patch was already merged by Haojian recently. You should >> probably rebase your patch stack on top of his maintainer tree. > > I've just come across the patch you mention in the arm mailing list. > > Could you please provide a link to Haojian's official public repository? According to MAINTAINERS, it's here: git://github.com/hzhuang1/linux.git But it seems it hasn't seen an update recently. Haojian? > If possible, a link link to your repository will also be very helpful. https://github.com/zonque/linux/tree/pxa-dma-v2 Daniel
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index b6cc181..432842c 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -236,7 +236,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)) { struct device_node *node; const struct of_device_id *of_id; - struct pxa_intc_conf *conf; struct resource res; int n, ret; @@ -246,7 +245,6 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)) return; } of_id = of_match_node(intc_ids, node); - conf = of_id->data; ret = of_property_read_u32(node, "marvell,intc-nr-irqs", &pxa_internal_irq_nr);
Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Daniel Mack <zonque@gmail.com> --- arch/arm/mach-pxa/irq.c | 2 -- 1 file changed, 2 deletions(-)