Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 54a3bdd76e82d7f64e5504409c55b51e48c3a10a

Authored by David Howells
Committed by Linus Torvalds
1 parent 769259160a

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>

Showing 1 changed file with 0 additions and 16 deletions Side-by-side Diff

arch/frv/kernel/setup.c
Diff comments   View file @ 54a3bdd
... ... @@ -60,10 +60,6 @@
60 60 static void __init setup_uclinux_memory(void);
61 61 #endif
62 62  
63   -#ifdef CONFIG_CONSOLE
64   -extern struct consw *conswitchp;
65   -#endif
66   -
67 63 #ifdef CONFIG_MB93090_MB00
68 64 static char __initdata mb93090_banner[] = "FJ/RH FR-V Linux";
69 65 static char __initdata mb93090_version[] = UTS_RELEASE;
... ... @@ -795,13 +791,6 @@
795 791 #endif
796 792 #endif
797 793  
798   -#if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
799   - /* we need to initialize the Flashrom device here since we might
800   - * do things with flash early on in the boot
801   - */
802   - flash_probe();
803   -#endif
804   -
805 794 /* deal with the command line - RedBoot may have passed one to the kernel */
806 795 memcpy(command_line, boot_command_line, sizeof(command_line));
807 796 *cmdline_p = &command_line[0];
... ... @@ -836,11 +825,6 @@
836 825 conswitchp = &dummy_con;
837 826 #endif
838 827 #endif
839   -
840   -#ifdef CONFIG_BLK_DEV_BLKMEM
841   - ROOT_DEV = MKDEV(BLKMEM_MAJOR,0);
842   -#endif
843   - /*rom_length = (unsigned long)&_flashend - (unsigned long)&_romvec;*/
844 828  
845 829 #ifdef CONFIG_MMU
846 830 setup_linux_memory();