diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
| commit | b3950d50cfc343b3e7dc5c69c96a61b182fd1e37 (patch) | |
| tree | d54affae2b1e25464493b48aa88cd8d6b4770812 /arch/powerpc/sysdev/fsl_msi.h | |
| parent | daefd89efc279b142bbb054577c2d706da211723 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' into gpio/next
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 @@ | |||
| 26 | #define FSL_PIC_IP_VMPIC 0x00000003 | 26 | #define FSL_PIC_IP_VMPIC 0x00000003 |
| 27 | 27 | ||
| 28 | struct fsl_msi { | 28 | struct fsl_msi { |
| 29 | struct irq_host *irqhost; | 29 | struct irq_domain *irqhost; |
| 30 | 30 | ||
| 31 | unsigned long cascade_irq; | 31 | unsigned long cascade_irq; |
| 32 | 32 | ||