diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-27 05:57:26 +0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-27 05:57:26 +0400 |
| commit | fc2ed77b9d6b579d61024163c74f41c24394fcc7 (patch) | |
| tree | 903d80ba1b1fc0eb15e122a8c12a72f72e7ed2de /arch/arm/mach-imx/imx51-dt.c | |
| parent | 3d04d42312eacc68fbcddea337f7eb34bc035dfb (diff) | |
| parent | 50269e19ad990e79eeda101fc6df80cffd5d4831 (diff) | |
| download | linux-fc2ed77b9d6b579d61024163c74f41c24394fcc7.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-imx/imx51-dt.c')
| -rw-r--r-- | arch/arm/mach-imx/imx51-dt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c index e6bad17b908c..1e03ef42faa0 100644 --- a/arch/arm/mach-imx/imx51-dt.c +++ b/arch/arm/mach-imx/imx51-dt.c @@ -47,7 +47,7 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = { static int __init imx51_tzic_add_irq_domain(struct device_node *np, struct device_node *interrupt_parent) { - irq_domain_add_simple(np, 0); + irq_domain_add_legacy(np, 128, 0, 0, &irq_domain_simple_ops, NULL); return 0; } @@ -57,7 +57,7 @@ static int __init imx51_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; } |