diff options
author | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
---|---|---|
committer | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 10:32:39 +0100 |
commit | 1f52299ec000e2161635b263d81ab92ea7f1f0a7 (patch) | |
tree | 66b1414ce81dacf5758e824640f869d16d024c4a /arch/arm/mach-imx/mach-imx6q.c | |
parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
download | linux-1f52299ec000e2161635b263d81ab92ea7f1f0a7.tar.bz2 |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6 into for_3.4/dt_irq_domain2
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index c25728106917..6075d4d62dd6 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -97,7 +97,8 @@ static int __init imx6q_gpio_add_irq_domain(struct device_node *np, static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; gpio_irq_base -= 32; - irq_domain_add_simple(np, gpio_irq_base); + irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, + NULL); return 0; } |