[PATCH] m68k: convert VME irq code

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 20 insertions, 20 deletions

diff --git a/include/asm-m68k/mvme16xhw.h b/include/asm-m68k/mvme16xhw.h
index 5d07231d2426..6117f56653d2 100644
--- a/include/asm-m68k/mvme16xhw.h
+++ b/include/asm-m68k/mvme16xhw.h
@@ -66,28 +66,28 @@ typedef struct {
 
 #define MVME162_IRQ_TYPE_PRIO   0
 
-#define MVME167_IRQ_PRN         0x54
-#define MVME16x_IRQ_I596        0x57
-#define MVME16x_IRQ_SCSI        0x55
-#define MVME16x_IRQ_FLY         0x7f
-#define MVME167_IRQ_SER_ERR     0x5c
-#define MVME167_IRQ_SER_MODEM   0x5d
-#define MVME167_IRQ_SER_TX      0x5e
-#define MVME167_IRQ_SER_RX      0x5f
-#define MVME16x_IRQ_TIMER       0x59
-#define MVME167_IRQ_ABORT       0x6e
-#define MVME162_IRQ_ABORT       0x5e
+#define MVME167_IRQ_PRN         (IRQ_USER+20)
+#define MVME16x_IRQ_I596        (IRQ_USER+23)
+#define MVME16x_IRQ_SCSI        (IRQ_USER+21)
+#define MVME16x_IRQ_FLY         (IRQ_USER+63)
+#define MVME167_IRQ_SER_ERR     (IRQ_USER+28)
+#define MVME167_IRQ_SER_MODEM   (IRQ_USER+29)
+#define MVME167_IRQ_SER_TX      (IRQ_USER+30)
+#define MVME167_IRQ_SER_RX      (IRQ_USER+31)
+#define MVME16x_IRQ_TIMER       (IRQ_USER+25)
+#define MVME167_IRQ_ABORT       (IRQ_USER+46)
+#define MVME162_IRQ_ABORT       (IRQ_USER+30)
 
 /* SCC interrupts, for MVME162 */
-#define MVME162_IRQ_SCC_BASE            0x40
-#define MVME162_IRQ_SCCB_TX             0x40
-#define MVME162_IRQ_SCCB_STAT           0x42
-#define MVME162_IRQ_SCCB_RX             0x44
-#define MVME162_IRQ_SCCB_SPCOND         0x46
-#define MVME162_IRQ_SCCA_TX             0x48
-#define MVME162_IRQ_SCCA_STAT           0x4a
-#define MVME162_IRQ_SCCA_RX             0x4c
-#define MVME162_IRQ_SCCA_SPCOND         0x4e
+#define MVME162_IRQ_SCC_BASE            (IRQ_USER+0)
+#define MVME162_IRQ_SCCB_TX             (IRQ_USER+0)
+#define MVME162_IRQ_SCCB_STAT           (IRQ_USER+2)
+#define MVME162_IRQ_SCCB_RX             (IRQ_USER+4)
+#define MVME162_IRQ_SCCB_SPCOND         (IRQ_USER+6)
+#define MVME162_IRQ_SCCA_TX             (IRQ_USER+8)
+#define MVME162_IRQ_SCCA_STAT           (IRQ_USER+10)
+#define MVME162_IRQ_SCCA_RX             (IRQ_USER+12)
+#define MVME162_IRQ_SCCA_SPCOND         (IRQ_USER+14)
 
 /* MVME162 version register */