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

[Charlie Paul]

From: Paul Butler <paul.butler at windriver.com>

A merge conflict resolution in aafea43a1528d028c66849e8266c04675aa6690d
reverted a change added in f8e6479d13bce233ff4f9ef58a522a4225ff651d

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;
-- 
1.7.9.5