diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 17:57:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 17:58:11 +0100 |
| commit | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (patch) | |
| tree | 0a74b982ab63dd20433bfe6abefdc8dd1b7336b4 /arch/powerpc/include/asm/xics.h | |
| parent | Merge tag 'tegra-soc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | mfd: twl-core: Add IRQ_DOMAIN dependency (diff) | |
| download | linux-3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c.tar.xz linux-3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c.zip | |
Merge branch 'depends/irqdomain' into next/drivers
This is needed in order for the tegra/soc-drivers branch
to work.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/include/asm/xics.h')
| -rw-r--r-- | arch/powerpc/include/asm/xics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h index c48de98ba94e..4ae9a09c3b89 100644 --- a/arch/powerpc/include/asm/xics.h +++ b/arch/powerpc/include/asm/xics.h @@ -86,7 +86,7 @@ struct ics { extern unsigned int xics_default_server; extern unsigned int xics_default_distrib_server; extern unsigned int xics_interrupt_server_size; -extern struct irq_host *xics_host; +extern struct irq_domain *xics_host; struct xics_cppr { unsigned char stack[MAX_NUM_PRIORITIES]; |