diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
| commit | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (patch) | |
| tree | 56a49fcd9a974d61f1a4e224f23efe9b4fd1b438 /arch/mips | |
| parent | db9431f0e697b132a7b6aca9c946f85851af5a39 (diff) | |
| parent | 5049b88232de6414144f4cf0f4510227afd0098e (diff) | |
Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.0
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/irq.h | 5 | ||||
| -rw-r--r-- | arch/mips/kernel/prom.c | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index 0ec01294b06..dc650aeac78 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -16,11 +16,6 @@ #include <irq.h> -static inline void irq_dispose_mapping(unsigned int virq) -{ - return; -} - #ifdef CONFIG_I8259 static inline int irq_canonicalize(int irq) { diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 5b7eade41fa..010aaaf2278 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -60,20 +60,6 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start, } #endif -/* - * irq_create_of_mapping - Hook to resolve OF irq specifier into a Linux irq# - * - * Currently the mapping mechanism is trivial; simple flat hwirq numbers are - * mapped 1:1 onto Linux irq numbers. Cascaded irq controllers are not - * supported. - */ -unsigned int irq_create_of_mapping(struct device_node *controller, - const u32 *intspec, unsigned int intsize) -{ - return intspec[0]; -} -EXPORT_SYMBOL_GPL(irq_create_of_mapping); - void __init early_init_devtree(void *params) { /* Setup flat device-tree pointer */ |