From: Mike Frysinger <vapier.adi@gmail.com>
Date: Sat, 2 Feb 2008 07:36:11 +0000 (+0800)
Subject: [Blackfin] arch: fix building with mtd uclinux by putting the mtd_phys option into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0eab3b784ffdd3912450c7654c75bbcc0270ee8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[Blackfin] arch: fix building with mtd uclinux by putting the mtd_phys option into the function it actually gets used in

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
---

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 8d9a40779de1..8229b1090eb9 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -407,6 +407,10 @@ static __init void parse_cmdline_early(char *cmdline_p)
  */
 static __init void  memory_setup(void)
 {
+#ifdef CONFIG_MTD_UCLINUX
+	unsigned long mtd_phys = 0;
+#endif
+
 	_rambase = (unsigned long)_stext;
 	_ramstart = (unsigned long)_end;
 
@@ -607,9 +611,6 @@ static __init void setup_bootmem_allocator(void)
 void __init setup_arch(char **cmdline_p)
 {
 	unsigned long l1_length, sclk, cclk;
-#ifdef CONFIG_MTD_UCLINUX
-	unsigned long mtd_phys = 0;
-#endif
 
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;