From 4825da2b701074b9a9737492c4a9ee172d389c9a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 20 Jun 2009 15:36:09 -0400 Subject: [PATCH] --- yaml --- r: 155573 b: refs/heads/master c: b2dc0a08845af9d6ea990a1a28d4545998707570 h: refs/heads/master i: 155571: 71b0f59f7e0e4f73ccd728a275bbcac512ef7ff8 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/setup.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d2051c2be002..a45e82e68e07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1997660cea28202ece0956cd44f332ac57700138 +refs/heads/master: b2dc0a08845af9d6ea990a1a28d4545998707570 diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/arch/blackfin/kernel/setup.c index 6136c33e919f..6e150d9b8862 100644 --- a/trunk/arch/blackfin/kernel/setup.c +++ b/trunk/arch/blackfin/kernel/setup.c @@ -868,13 +868,6 @@ void __init setup_arch(char **cmdline_p) else printk(KERN_CONT "and Disabled\n"); -#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 - printk(KERN_INFO "Boot Mode: %i\n", bfin_read_SYSCR() & 0xF); /* Newer parts mirror SWRST bits in SYSCR */