diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 16:57:58 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 16:58:11 +0000 |
commit | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (patch) | |
tree | 0a74b982ab63dd20433bfe6abefdc8dd1b7336b4 /arch/x86/include/asm/irq_controller.h | |
parent | 7cb7f82611dddb4b471d42d0fad645dd0dc3f360 (diff) | |
parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
download | talos-op-linux-3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c.tar.gz talos-op-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/x86/include/asm/irq_controller.h')
-rw-r--r-- | arch/x86/include/asm/irq_controller.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/include/asm/irq_controller.h b/arch/x86/include/asm/irq_controller.h deleted file mode 100644 index 423bbbddf36d..000000000000 --- a/arch/x86/include/asm/irq_controller.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __IRQ_CONTROLLER__ -#define __IRQ_CONTROLLER__ - -struct irq_domain { - int (*xlate)(struct irq_domain *h, const u32 *intspec, u32 intsize, - u32 *out_hwirq, u32 *out_type); - void *priv; - struct device_node *controller; - struct list_head l; -}; - -#endif |