diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /arch/sh/kernel/irq.c | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'arch/sh/kernel/irq.c')
-rw-r--r-- | arch/sh/kernel/irq.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 0586bc62ad96..9bf19b00696a 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -248,9 +248,6 @@ asmlinkage void do_softirq(void) | |||
248 | 248 | ||
249 | void __init init_IRQ(void) | 249 | void __init init_IRQ(void) |
250 | { | 250 | { |
251 | #ifdef CONFIG_CPU_HAS_PINT_IRQ | ||
252 | init_IRQ_pint(); | ||
253 | #endif | ||
254 | plat_irq_setup(); | 251 | plat_irq_setup(); |
255 | 252 | ||
256 | /* Perform the machine specific initialisation */ | 253 | /* Perform the machine specific initialisation */ |