---

yaml --- r: 155573 b: refs/heads/master c: b2dc0a0 h: refs/heads/master i: 155571: 71b0f59 v: v3
git-mirror · Jul 16, 2009 · 4825da2 · 4825da2
1 parent 0f4c533
commit 4825da2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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 */