diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 20:48:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 20:48:58 +0100 |
| commit | b3950d50cfc343b3e7dc5c69c96a61b182fd1e37 (patch) | |
| tree | d54affae2b1e25464493b48aa88cd8d6b4770812 /arch/powerpc/include/asm/mpic.h | |
| parent | Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/sc... (diff) | |
| parent | mfd: twl-core: Add IRQ_DOMAIN dependency (diff) | |
| download | linux-b3950d50cfc343b3e7dc5c69c96a61b182fd1e37.tar.xz linux-b3950d50cfc343b3e7dc5c69c96a61b182fd1e37.zip | |
Merge branch 'irqdomain/next' into gpio/next
Diffstat (limited to 'arch/powerpc/include/asm/mpic.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 67b4d9837236..a5b7c56237f9 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -255,7 +255,7 @@ struct mpic struct device_node *node; /* The remapper for this MPIC */ - struct irq_host *irqhost; + struct irq_domain *irqhost; /* The "linux" controller struct */ struct irq_chip hc_irq; |