From 5745fbd8e97db95e40c2d266cdc71e7dca83c77b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 11 Feb 2013 12:01:47 -0200 Subject: [PATCH] --- yaml --- r: 361155 b: refs/heads/master c: f26b016e7aeeebe793eb03e609baac80e1b02947 h: refs/heads/master i: 361153: 77bb2af019d08fccf11225125c5106c6de36bd1d 361151: a19e29800a45e353621a46cb3e10b457fbf254fe v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/icoll.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc564f8c0cc5..6d83ce448c7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb39cdc52f4278614579c1041155a7b182f47e75 +refs/heads/master: f26b016e7aeeebe793eb03e609baac80e1b02947 diff --git a/trunk/arch/arm/mach-mxs/icoll.c b/trunk/arch/arm/mach-mxs/icoll.c index 8fb23af154b3..e26eeba46598 100644 --- a/trunk/arch/arm/mach-mxs/icoll.c +++ b/trunk/arch/arm/mach-mxs/icoll.c @@ -100,7 +100,7 @@ static struct irq_domain_ops icoll_irq_domain_ops = { .xlate = irq_domain_xlate_onecell, }; -void __init icoll_of_init(struct device_node *np, +static void __init icoll_of_init(struct device_node *np, struct device_node *interrupt_parent) { /*