Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c0eab3b784ffdd3912450c7654c75bbcc0270ee8
Commit: c0eab3b784ffdd3912450c7654c75bbcc0270ee8
Parent: 550d553838b5369efba9e51520c85dbd03371cc8
Author: Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 2 15:36:11 2008 +0800
Committer: Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Sat Feb 2 15:36:11 2008 +0800
[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 <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
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 8d9a407..8229b10 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
