aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/mpic_msi.c
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2012-02-27 10:32:39 +0100
committerBenoit Cousson <b-cousson@ti.com>2012-02-27 10:32:39 +0100
commit1f52299ec000e2161635b263d81ab92ea7f1f0a7 (patch)
tree66b1414ce81dacf5758e824640f869d16d024c4a /arch/powerpc/sysdev/mpic_msi.c
parentffd76d8be36da09f8456c55569c008f5aa93095e (diff)
parent280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff)
downloadkernel_goldelico_gta04-1f52299ec000e2161635b263d81ab92ea7f1f0a7.zip
kernel_goldelico_gta04-1f52299ec000e2161635b263d81ab92ea7f1f0a7.tar.gz
kernel_goldelico_gta04-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/powerpc/sysdev/mpic_msi.c')
-rw-r--r--arch/powerpc/sysdev/mpic_msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index 0f67cd7..0622aa9 100644
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -32,7 +32,7 @@ void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
{
irq_hw_number_t hwirq;
- struct irq_host_ops *ops = mpic->irqhost->ops;
+ const struct irq_domain_ops *ops = mpic->irqhost->ops;
struct device_node *np;
int flags, index, i;
struct of_irq oirq;