diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-02-02 02:36:11 -0500 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2008-02-02 02:36:11 -0500 |
commit | c0eab3b784ffdd3912450c7654c75bbcc0270ee8 (patch) | |
tree | fad94694396f7f88f432878b3e890c510a465386 /arch/blackfin/kernel/setup.c | |
parent | 550d553838b5369efba9e51520c85dbd03371cc8 (diff) |
[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>
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) | |||
407 | */ | 407 | */ |
408 | static __init void memory_setup(void) | 408 | static __init void memory_setup(void) |
409 | { | 409 | { |
410 | #ifdef CONFIG_MTD_UCLINUX | ||
411 | unsigned long mtd_phys = 0; | ||
412 | #endif | ||
413 | |||
410 | _rambase = (unsigned long)_stext; | 414 | _rambase = (unsigned long)_stext; |
411 | _ramstart = (unsigned long)_end; | 415 | _ramstart = (unsigned long)_end; |
412 | 416 | ||
@@ -607,9 +611,6 @@ static __init void setup_bootmem_allocator(void) | |||
607 | void __init setup_arch(char **cmdline_p) | 611 | void __init setup_arch(char **cmdline_p) |
608 | { | 612 | { |
609 | unsigned long l1_length, sclk, cclk; | 613 | unsigned long l1_length, sclk, cclk; |
610 | #ifdef CONFIG_MTD_UCLINUX | ||
611 | unsigned long mtd_phys = 0; | ||
612 | #endif | ||
613 | 614 | ||
614 | #ifdef CONFIG_DUMMY_CONSOLE | 615 | #ifdef CONFIG_DUMMY_CONSOLE |
615 | conswitchp = &dummy_con; | 616 | conswitchp = &dummy_con; |