Browse Source

[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>
Mike Frysinger 17 years ago
parent
commit
c0eab3b784
1 changed files with 4 additions and 3 deletions
  1. 4 3
      arch/blackfin/kernel/setup.c

+ 4 - 3
arch/blackfin/kernel/setup.c

@@ -407,6 +407,10 @@ static __init void parse_cmdline_early(char *cmdline_p)
  */
  */
 static __init void  memory_setup(void)
 static __init void  memory_setup(void)
 {
 {
+#ifdef CONFIG_MTD_UCLINUX
+	unsigned long mtd_phys = 0;
+#endif
+
 	_rambase = (unsigned long)_stext;
 	_rambase = (unsigned long)_stext;
 	_ramstart = (unsigned long)_end;
 	_ramstart = (unsigned long)_end;
 
 
@@ -607,9 +611,6 @@ static __init void setup_bootmem_allocator(void)
 void __init setup_arch(char **cmdline_p)
 void __init setup_arch(char **cmdline_p)
 {
 {
 	unsigned long l1_length, sclk, cclk;
 	unsigned long l1_length, sclk, cclk;
-#ifdef CONFIG_MTD_UCLINUX
-	unsigned long mtd_phys = 0;
-#endif
 
 
 #ifdef CONFIG_DUMMY_CONSOLE
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;
 	conswitchp = &dummy_con;