diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2008-02-02 15:36:11 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@analog.com> | 2008-02-02 15:36:11 +0800 |
| commit | c0eab3b784ffdd3912450c7654c75bbcc0270ee8 (patch) | |
| tree | fad94694396f7f88f432878b3e890c510a465386 /arch/blackfin | |
| parent | 550d553838b5369efba9e51520c85dbd03371cc8 (diff) | |
| download | talos-obmc-linux-c0eab3b784ffdd3912450c7654c75bbcc0270ee8.tar.gz talos-obmc-linux-c0eab3b784ffdd3912450c7654c75bbcc0270ee8.zip | |
[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')
| -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) */ 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; |
