Skip to contentSkip to conversation

M32R - remove dead config symbols from M32R code

PATCH In review Jiri Olsa 2 participants 2 messages Nov 8, 2007 Kernel janitors

lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

PATCH 1/1 M32R - remove dead config symbols from M32R code

remove dead config symbols from M32R code

Signed-off-by Jiri Olsa <[email protected]>
---
 arch/m32r/boot/compressed/m32r_sio.c     |    4 ++--
 include/asm-m32r/irq.h                   |    2 +-
 include/asm-m32r/m32700ut/m32700ut_pld.h |    4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)
arch/m32r/boot/compressed/m32r_sio.c +2 -2
index ee3c8be..01d877c 100644
@@ -17,7 +17,7 @@ static int puts(const char *s)
 	return 0;
 }
 
-#if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT)
 #include <asm/m32r.h>
 #include <asm/io.h>
 

@@ -52,7 +52,7 @@ static void putc(char c)
 	}
 	*BOOT_SIO0TXB = c;
 }
-#else /* !(CONFIG_PLAT_M32700UT_Alpha) && !(CONFIG_PLAT_M32700UT) */
+#else /* !(CONFIG_PLAT_M32700UT) */
 #if defined(CONFIG_PLAT_MAPPI2)
 #define SIO0STS	(volatile unsigned short *)(0xa0efd000 + 14)
 #define SIO0TXB	(volatile unsigned short *)(0xa0efd000 + 30)
include/asm-m32r/irq.h +1 -1
index 2f93f47..242028b 100644
@@ -3,7 +3,7 @@
 #define _ASM_M32R_IRQ_H
 
 
-#if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV)
+#if defined(CONFIG_PLAT_USRV)
 /*
  * IRQ definitions for M32700UT
  *  M32700 Chip: 64 interrupts
include/asm-m32r/m32700ut/m32700ut_pld.h +1 -3
index d391212..57623be 100644
@@ -13,9 +13,7 @@
  * this archive for more details.
  */
 
-#if defined(CONFIG_PLAT_M32700UT_Alpha)
-#define PLD_PLAT_BASE		0x08c00000
-#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV)
 #define PLD_PLAT_BASE		0x04c00000
 #else
 #error "no platform configuration"
Acked-by on v1 1/1
#1 lore raw

From: Jiri Olsa <[email protected]>
Subject: [PATCH] M32R - remove dead config symbols from M32R code
Date: Thu, 08 Nov 2007 12:29:38 +0100

Quoted 9 lines

remove dead config symbols from M32R code

Signed-off-by Jiri Olsa <[email protected]>
---
 arch/m32r/boot/compressed/m32r_sio.c     |    4 ++--
 include/asm-m32r/irq.h                   |    2 +-
 include/asm-m32r/m32700ut/m32700ut_pld.h |    4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

It looks fine to me.

Acked-by Hirokazu Takata <[email protected]>

Thank you.

--
Hirokazu Takata <[email protected]>
Linux/M32R Project: http://www.linux-m32r.org/