[linux-yocto] [PATCH 57/57] gpio: repairs merge comflict

[Bruce Ashfield]

typo in the short log .. also if we have a merge conflict in the tree,
that means a specific git merge issue. If so, we need a commit ID
reference for that bad merge.

Bruce

On 14-03-18 12:56 AM, Charlie Paul wrote:
> From: Paul Butler <paul.butler at windriver.com>
>
> Signed-off-by: Paul Butler <paul.butler at windriver.com>
> ---
>   drivers/gpio/gpio-pl061.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
> index 0254470..c13f8d1 100644
> --- a/drivers/gpio/gpio-pl061.c
> +++ b/drivers/gpio/gpio-pl061.c
> @@ -358,7 +358,7 @@ static int pl061_probe(struct device *dev,
>   	irq_set_chained_handler(irq, pl061_irq_handler);
>   	irq_set_handler_data(irq, chip);
>
> -	chip->domain = irq_domain_add_simple(adev->dev.of_node, PL061_GPIO_NR,
> +	chip->domain = irq_domain_add_simple(dev->of_node, PL061_GPIO_NR,
>   					     irq_base, &pl061_domain_ops, chip);
>   	if (!chip->domain)
>   		return -ENODEV;
>