1 files changed, 9 insertions, 10 deletions

diff --git a/include/asm-mips/dec/kn02.h b/include/asm-mips/dec/kn02.h
index 2c935f972c67..83a042e90687 100644
--- a/include/asm-mips/dec/kn02.h
+++ b/include/asm-mips/dec/kn02.h
@@ -8,16 +8,11 @@
  *
  * Copyright (C) 1995,1996 by Paul M. Antoine, some code and definitions
  * are by courtesy of Chris Fraser.
- * Copyright (C) 2002, 2003  Maciej W. Rozycki
+ * Copyright (C) 2002, 2003, 2005  Maciej W. Rozycki
  */
 #ifndef __ASM_MIPS_DEC_KN02_H
 #define __ASM_MIPS_DEC_KN02_H
 
-#ifndef __ASSEMBLY__
-#include <linux/spinlock.h>
-#include <linux/types.h>
-#endif
-
 #include <asm/addrspace.h>
 #include <asm/dec/ecc.h>
 
@@ -53,8 +48,8 @@
 #define KN02_CSR_PSU            (1<<27)         /* power supply unit warning */
 #define KN02_CSR_NVRAM          (1<<26)         /* ~NVRAM clear jumper */
 #define KN02_CSR_REFEVEN        (1<<25)         /* mem refresh bank toggle */
-#define KN03_CSR_NRMOD          (1<<24)         /* ~NRMOD manufact. jumper */
-#define KN03_CSR_IOINTEN        (0xff<<16)      /* IRQ mask bits */
+#define KN02_CSR_NRMOD          (1<<24)         /* ~NRMOD manufact. jumper */
+#define KN02_CSR_IOINTEN        (0xff<<16)      /* IRQ mask bits */
 #define KN02_CSR_DIAGCHK        (1<<15)         /* diagn/norml ECC reads */
 #define KN02_CSR_DIAGGEN        (1<<14)         /* diagn/norml ECC writes */
 #define KN02_CSR_CORRECT        (1<<13)         /* ECC correct/check */
@@ -63,8 +58,8 @@
 #define KN02_CSR_BNK32M         (1<<10)         /* 32M/8M stride */
 #define KN02_CSR_DIAGDN         (1<<9)          /* DIAGDN manufact. jumper */
 #define KN02_CSR_BAUD38         (1<<8)          /* DZ11 38/19kbps ext. rate */
-#define KN03_CSR_IOINT          (0xff<<0)       /* IRQ status bits (r/o) */
-#define KN03_CSR_LEDS           (0xff<<0)       /* ~diagnostic LEDs (w/o) */
+#define KN02_CSR_IOINT          (0xff<<0)       /* IRQ status bits (r/o) */
+#define KN02_CSR_LEDS           (0xff<<0)       /* ~diagnostic LEDs (w/o) */
 
 
 /*
@@ -98,6 +93,10 @@
 
 
 #ifndef __ASSEMBLY__
+
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
 extern u32 cached_kn02_csr;
 extern spinlock_t kn02_lock;
 extern void init_kn02_irqs(int base);