summaryrefslogtreecommitdiff
path: root/arch/m68k/platform/coldfire/intc-simr.c
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-06-23 09:52:25 +0400
committerGreg Ungerer <gerg@uclinux.org>2011-07-25 05:20:41 +0400
commit622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch)
tree468728239c79b081a9e7739e627728462eb9579e /arch/m68k/platform/coldfire/intc-simr.c
parentf4a5437333e405e967be660430e58fc2355c62c8 (diff)
downloadlinux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.xz
m68knommu: correctly use trap_init
Currently trap_init() is an empty function for m68knommu. Instead the vectors are being setup as part of the IRQ initialization. This is inconsistent with m68k and other architectures. Change the local init_vectors() to be trap_init(), and init the vectors at the correct time during startup. This will help merge of m68k and m68knommu trap code in the furture. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/coldfire/intc-simr.c')
-rw-r--r--arch/m68k/platform/coldfire/intc-simr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/platform/coldfire/intc-simr.c b/arch/m68k/platform/coldfire/intc-simr.c
index d6a4d9d53e42..650d52e2927e 100644
--- a/arch/m68k/platform/coldfire/intc-simr.c
+++ b/arch/m68k/platform/coldfire/intc-simr.c
@@ -171,8 +171,6 @@ void __init init_IRQ(void)
{
int irq, eirq;
- init_vectors();
-
/* Mask all interrupt sources */
__raw_writeb(0xff, MCFINTC0_SIMR);
if (MCFINTC1_SIMR)