From 3bd4c902da14030c9a780cd0c4be2ffe9aee2974 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Thu, 16 Jun 2005 20:30:54 +0000
Subject: Deal with the bloody KSEG vs CKSEG horror...

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 include/asm-mips/dec/kn01.h   |  4 ++--
 include/asm-mips/dec/kn02.h   |  2 +-
 include/asm-mips/dec/kn02xa.h | 14 +++++++-------
 include/asm-mips/dec/kn03.h   |  2 +-
 include/asm-mips/dec/prom.h   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'include/asm-mips/dec')

diff --git a/include/asm-mips/dec/kn01.h b/include/asm-mips/dec/kn01.h
index 946943502f83..325fcbbbdfa0 100644
--- a/include/asm-mips/dec/kn01.h
+++ b/include/asm-mips/dec/kn01.h
@@ -15,7 +15,7 @@
 
 #include <asm/addrspace.h>
 
-#define KN01_SLOT_BASE	KSEG1ADDR(0x10000000)
+#define KN01_SLOT_BASE	CKSEG1ADDR(0x10000000)
 #define KN01_SLOT_SIZE	0x01000000
 
 /*
@@ -51,7 +51,7 @@
 /*
  * Frame buffer memory address.
  */
-#define KN01_VFB_MEM	KSEG1ADDR(0x0fc00000)
+#define KN01_VFB_MEM	CKSEG1ADDR(0x0fc00000)
 
 /*
  * CPU interrupt bits.
diff --git a/include/asm-mips/dec/kn02.h b/include/asm-mips/dec/kn02.h
index f797f7045920..2c935f972c67 100644
--- a/include/asm-mips/dec/kn02.h
+++ b/include/asm-mips/dec/kn02.h
@@ -22,7 +22,7 @@
 #include <asm/dec/ecc.h>
 
 
-#define KN02_SLOT_BASE	KSEG1ADDR(0x1fc00000)
+#define KN02_SLOT_BASE	CKSEG1ADDR(0x1fc00000)
 #define KN02_SLOT_SIZE	0x00080000
 
 /*
diff --git a/include/asm-mips/dec/kn02xa.h b/include/asm-mips/dec/kn02xa.h
index 648c4dcbba1d..f6bdf730d9fb 100644
--- a/include/asm-mips/dec/kn02xa.h
+++ b/include/asm-mips/dec/kn02xa.h
@@ -20,7 +20,7 @@
 #include <asm/addrspace.h>
 #include <asm/dec/ioasic_addrs.h>
 
-#define KN02XA_SLOT_BASE	KSEG1ADDR(0x1c000000)
+#define KN02XA_SLOT_BASE	CKSEG1ADDR(0x1c000000)
 
 /*
  * Some port addresses...
@@ -32,16 +32,16 @@
 /*
  * Memory control ASIC registers.
  */
-#define KN02XA_MER	KSEG1ADDR(0x0c400000)	/* memory error register */
-#define KN02XA_MSR	KSEG1ADDR(0x0c800000)	/* memory size register */
+#define KN02XA_MER	CKSEG1ADDR(0x0c400000)	/* memory error register */
+#define KN02XA_MSR	CKSEG1ADDR(0x0c800000)	/* memory size register */
 
 /*
  * CPU control ASIC registers.
  */
-#define KN02XA_MEM_CONF	KSEG1ADDR(0x0e000000)	/* write timeout config */
-#define KN02XA_EAR	KSEG1ADDR(0x0e000004)	/* error address register */
-#define KN02XA_BOOT0	KSEG1ADDR(0x0e000008)	/* boot 0 register */
-#define KN02XA_MEM_INTR	KSEG1ADDR(0x0e00000c)	/* write err IRQ stat & ack */
+#define KN02XA_MEM_CONF	CKSEG1ADDR(0x0e000000)	/* write timeout config */
+#define KN02XA_EAR	CKSEG1ADDR(0x0e000004)	/* error address register */
+#define KN02XA_BOOT0	CKSEG1ADDR(0x0e000008)	/* boot 0 register */
+#define KN02XA_MEM_INTR	CKSEG1ADDR(0x0e00000c)	/* write err IRQ stat & ack */
 
 /*
  * Memory Error Register bits, common definitions.
diff --git a/include/asm-mips/dec/kn03.h b/include/asm-mips/dec/kn03.h
index 676abd17c6a4..9d787cc26353 100644
--- a/include/asm-mips/dec/kn03.h
+++ b/include/asm-mips/dec/kn03.h
@@ -19,7 +19,7 @@
 #include <asm/dec/ecc.h>
 #include <asm/dec/ioasic_addrs.h>
 
-#define KN03_SLOT_BASE	KSEG1ADDR(0x1f800000)
+#define KN03_SLOT_BASE	CKSEG1ADDR(0x1f800000)
 
 /*
  * Some port addresses...
diff --git a/include/asm-mips/dec/prom.h b/include/asm-mips/dec/prom.h
index a05d6d3395fe..59b8ce6e9b36 100644
--- a/include/asm-mips/dec/prom.h
+++ b/include/asm-mips/dec/prom.h
@@ -24,7 +24,7 @@
  * PMAX/3MAX PROM entry points for DS2100/3100's and DS5000/2xx's.
  * Many of these will work for MIPSen as well!
  */
-#define VEC_RESET		(u64 *)KSEG1ADDR(0x1fc00000)
+#define VEC_RESET		(u64 *)CKSEG1ADDR(0x1fc00000)
 							/* Prom base address */
 
 #define PMAX_PROM_ENTRY(x)	(VEC_RESET + (x))	/* Prom jump table */
-- 
cgit v1.2.2