From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 4 Dec 2013 13:48:17 +0000 (+0100)
Subject: Merge branch 'mark-irqs' into devel
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33e0aae11e4854c792e9871f94da6d28bf2e2bb8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'mark-irqs' into devel

Conflicts:
	drivers/gpio/gpio-em.c
---

33e0aae11e4854c792e9871f94da6d28bf2e2bb8
diff --cc drivers/gpio/gpio-em.c
index be7e3b92f986,1cc53516e8b4..1e98a9873967
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@@ -337,8 -358,12 +358,10 @@@ static int em_gio_probe(struct platform
  	irq_chip->name = name;
  	irq_chip->irq_mask = em_gio_irq_disable;
  	irq_chip->irq_unmask = em_gio_irq_enable;
 -	irq_chip->irq_enable = em_gio_irq_enable;
 -	irq_chip->irq_disable = em_gio_irq_disable;
  	irq_chip->irq_set_type = em_gio_irq_set_type;
+ 	irq_chip->irq_startup = em_gio_irq_startup;
+ 	irq_chip->irq_shutdown = em_gio_irq_shutdown;
 -	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE;
 +	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
  
  	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
  					      pdata->number_of_pins,