Merge branches 'omap1-upstream' and 'omap2-upstream' into devel

[linux-2.6-omap-h63xx.git] / include / asm-mips / mips-boards / maltaint.h

diff --git a/include/asm-mips/mips-boards/maltaint.h b/include/asm-mips/mips-boards/maltaint.h
index da6cc2fbbc780990e1685973b064697aa7bb19ea..7461318f1cd10a12c77823bec2beb86ae5d029a3 100644 (file)
--- a/include/asm-mips/mips-boards/maltaint.h
+++ b/include/asm-mips/mips-boards/maltaint.h
@@ -25,16 +25,13 @@
 #ifndef _MIPS_MALTAINT_H
 #define _MIPS_MALTAINT_H
 
+#include <irq.h>
+
 /*
  * Interrupts 0..15 are used for Malta ISA compatible interrupts
  */
 #define MALTA_INT_BASE         0
 
-/*
- * Interrupts 16..23 are used for Malta CPU interrupts (nonEIC mode)
- */
-#define MIPSCPU_INT_BASE       16
-
 /* CPU interrupt offsets */
 #define MIPSCPU_INT_SW0                0
 #define MIPSCPU_INT_SW1                1
@@ -47,7 +44,6 @@
 #define MIPSCPU_INT_COREHI     MIPSCPU_INT_MB3
 #define MIPSCPU_INT_MB4                6
 #define MIPSCPU_INT_CORELO     MIPSCPU_INT_MB4
-#define MIPSCPU_INT_CPUCTR     7
 
 /*
  * Interrupts 64..127 are used for Soc-it Classic interrupts