Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=54a3bdd76e82d7f64e5504409c55b51e48c3a10a
Commit:     54a3bdd76e82d7f64e5504409c55b51e48c3a10a
Parent:     769259160a0e0bae51f1e5377bacf1d0265e7001
Author:     David Howells <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:38:28 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:37 2007 -0700

    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 <[EMAIL PROTECTED]>]
    
    Signed-off-by: David Howells <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/frv/kernel/setup.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index aa3c795..c1c32e4 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to