diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/mfd/max8925-core.c | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/mfd/max8925-core.c')
| -rw-r--r-- | drivers/mfd/max8925-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 97a787ab3d51..8520bd68c1ff 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c | |||
| @@ -658,7 +658,7 @@ static int max8925_irq_domain_map(struct irq_domain *d, unsigned int virq, | |||
| 658 | return 0; | 658 | return 0; |
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | static struct irq_domain_ops max8925_irq_domain_ops = { | 661 | static const struct irq_domain_ops max8925_irq_domain_ops = { |
| 662 | .map = max8925_irq_domain_map, | 662 | .map = max8925_irq_domain_map, |
| 663 | .xlate = irq_domain_xlate_onetwocell, | 663 | .xlate = irq_domain_xlate_onetwocell, |
| 664 | }; | 664 | }; |