From 39af191dcf885039043c0f5ff97fea330e9ac6f0 Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Wed, 12 Dec 2012 08:32:11 +0100
Subject: [PATCH] --- yaml --- r: 347769 b: refs/heads/master c:
 b8b499c86be58cb309964fcab5b62ac4a240a878 h: refs/heads/master i:   347767:
 3d7813fabf78c57df555b99af8724802d9d1182c v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d995cc7a49e..5f3a06936c73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4beba08ba1574f6d427347edaba5b924b2f70826
+refs/heads/master: b8b499c86be58cb309964fcab5b62ac4a240a878
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index 9a89bf4aefe1..3f6cbb2e3eda 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -733,7 +733,7 @@ void __init setup_arch(char **cmdline_p)
 	setup_processor();
 	mdesc = setup_machine_fdt(__atags_pointer);
 	if (!mdesc)
-		mdesc = setup_machine_tags(__atags_pointer, machine_arch_type);
+		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
 	machine_desc = mdesc;
 	machine_name = mdesc->name;