diff --git a/[refs] b/[refs] index 91c1ae686c32..0e11ad5aa487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b46378bc59989d6d284b569b5e2a28e8a50e70f8 +refs/heads/master: b2078fa221e31a491d0bd720e3acdf9870fe40fd diff --git a/trunk/arch/sh/kernel/cpu/irq/ipr.c b/trunk/arch/sh/kernel/cpu/irq/ipr.c index 5da325414880..56ea7b269b59 100644 --- a/trunk/arch/sh/kernel/cpu/irq/ipr.c +++ b/trunk/arch/sh/kernel/cpu/irq/ipr.c @@ -49,7 +49,6 @@ static void enable_ipr_irq(unsigned int irq) * bits/4. This is to make it easier to read the value directly from the * datasheets. The IPR address is calculated using the ipr_offset table. */ - void register_ipr_controller(struct ipr_desc *desc) { int i; @@ -71,12 +70,4 @@ void register_ipr_controller(struct ipr_desc *desc) disable_ipr_irq(p->irq); } } - EXPORT_SYMBOL(register_ipr_controller); - -#if !defined(CONFIG_CPU_HAS_PINT_IRQ) -int ipr_irq_demux(int irq) -{ - return irq; -} -#endif