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/powerpc/sysdev/fsl_msi.h | |
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/powerpc/sysdev/fsl_msi.h')
-rw-r--r-- | arch/powerpc/sysdev/fsl_msi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h index f6c646a52541..8225f8653f78 100644 --- a/arch/powerpc/sysdev/fsl_msi.h +++ b/arch/powerpc/sysdev/fsl_msi.h @@ -26,7 +26,7 @@ #define FSL_PIC_IP_VMPIC 0x00000003 struct fsl_msi { - struct irq_host *irqhost; + struct irq_domain *irqhost; unsigned long cascade_irq; |