Commit 7852375b authored by Jiri Olsa's avatar Jiri Olsa Committed by Linus Torvalds
Browse files

m32r: remove dead config symbols from M32R code 



remove dead config symbols from M32R code

Signed-off-by: default avatarJiri Olsa <olsajiri@gmail.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 134d4956

arch/m32r/boot/compressed/m32r_sio.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"