From e0d57b62970defa403205c45509178cabe589480 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 28 Mar 2007 23:36:03 +0900
Subject: [PATCH] --- yaml --- r: 54359 b: refs/heads/master c:
 0264f1603904dbee3196abc748a53fb0b23b8046 h: refs/heads/master i:   54357:
 f60278913773fcdb5f2829cbf0201f15837103a0   54355:
 79c1b1804aad796b30bb53c5d04566d48ad2b9a5   54351:
 3067974ebc84d1c7f606046a7e64bd999df703c1 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sh/boards/lboxre2/setup.c | 3 ++-
 trunk/include/asm-sh/lboxre2.h       | 9 ++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c2e3e7bef363..a94bbf2a8059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652b9672cfc4000382f0f3f41907d9d32e5bd327
+refs/heads/master: 0264f1603904dbee3196abc748a53fb0b23b8046
diff --git a/trunk/arch/sh/boards/lboxre2/setup.c b/trunk/arch/sh/boards/lboxre2/setup.c
index fc3cba3f0606..4e20f7c63bf3 100644
--- a/trunk/arch/sh/boards/lboxre2/setup.c
+++ b/trunk/arch/sh/boards/lboxre2/setup.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/pata_platform.h>
 #include <asm/machvec.h>
+#include <asm/addrspace.h>
 #include <asm/lboxre2.h>
 #include <asm/io.h>
 
@@ -53,7 +54,7 @@ static int __init lboxre2_devices_setup(void)
 	unsigned long paddrbase, psize;
 
 	/* open I/O area window */
-	paddrbase = virt_to_phys((void*)CONFIG_CF0_BASE_ADDR);
+	paddrbase = virt_to_phys((void*)PA_AREA5_IO);
 	psize = PAGE_SIZE;
 	prot = PAGE_KERNEL_PCC( 1 , _PAGE_PCC_IO16);
 	cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot.pgprot);
diff --git a/trunk/include/asm-sh/lboxre2.h b/trunk/include/asm-sh/lboxre2.h
index 65775668df93..e6d160504923 100644
--- a/trunk/include/asm-sh/lboxre2.h
+++ b/trunk/include/asm-sh/lboxre2.h
@@ -2,8 +2,6 @@
 #define __ASM_SH_LBOXRE2_H
 
 /*
- * linux/include/asm-sh/lbox.h
- *
  * Copyright (C) 2007 Nobuhiro Iwamatsu
  *
  * NTT COMWARE L-BOX RE2 support
@@ -14,11 +12,8 @@
  *
  */
 
-#define CONFIG_CF0_BASE_ADDR	0xb4000000 /* Boot only */
-#define CONFIG_CF1_BASE_ADDR	0xb8000000
-
-#define IRQ_CF1 	9	/* CF1 */
-#define IRQ_CF0 	10	/* CF0 */
+#define IRQ_CF1		9	/* CF1 */
+#define IRQ_CF0		10	/* CF0 */
 #define IRQ_INTD	11	/* INTD */
 #define IRQ_ETH1	12	/* Ether1 */
 #define IRQ_ETH0	13	/* Ether0 */