Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[karo-tx-linux.git] / include / asm-sh / lboxre2.h

diff --git a/include/asm-sh/lboxre2.h b/include/asm-sh/lboxre2.h
index 65775668df932df1ada11f78a967fa59a2dd02c1..e6d160504923c2620d1c87f1288ce20895dff265 100644 (file)
--- a/include/asm-sh/lboxre2.h
+++ b/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 */