forked from Minki/linux
FRV: Remove some dead code
Remove some dead chunks of code that are bounded by preprocessor conditionals controlled by apparently no-longer available config options. These are: CONFIG_BLK_DEV_BLKMEM CONFIG_CHR_DEV_FLASH CONFIG_BLK_DEV_FLASH CONFIG_CONSOLE [Found by Robert P. J. Day <rpjday@mindspring.com>] Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
769259160a
commit
54a3bdd76e
@ -60,10 +60,6 @@ static void __init setup_linux_memory(void);
|
||||
static void __init setup_uclinux_memory(void);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CONSOLE
|
||||
extern struct consw *conswitchp;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MB93090_MB00
|
||||
static char __initdata mb93090_banner[] = "FJ/RH FR-V Linux";
|
||||
static char __initdata mb93090_version[] = UTS_RELEASE;
|
||||
@ -795,13 +791,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
|
||||
/* we need to initialize the Flashrom device here since we might
|
||||
* do things with flash early on in the boot
|
||||
*/
|
||||
flash_probe();
|
||||
#endif
|
||||
|
||||
/* deal with the command line - RedBoot may have passed one to the kernel */
|
||||
memcpy(command_line, boot_command_line, sizeof(command_line));
|
||||
*cmdline_p = &command_line[0];
|
||||
@ -837,11 +826,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_BLKMEM
|
||||
ROOT_DEV = MKDEV(BLKMEM_MAJOR,0);
|
||||
#endif
|
||||
/*rom_length = (unsigned long)&_flashend - (unsigned long)&_romvec;*/
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
setup_linux_memory();
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user