aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-12-12 02:32:11 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-12-16 05:04:24 -0500
commitb8b499c86be58cb309964fcab5b62ac4a240a878 (patch)
tree907431ddfd2cb9879694b3066dd7d8c7ff8ca326 /arch/arm/kernel/setup.c
parent4beba08ba1574f6d427347edaba5b924b2f70826 (diff)
ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure
This modification is needed to proper boot the custom machines with the IDs that are not described in the mach-types.h table. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 9a89bf4aefe1..3f6cbb2e3eda 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -733,7 +733,7 @@ void __init setup_arch(char **cmdline_p)
733 setup_processor(); 733 setup_processor();
734 mdesc = setup_machine_fdt(__atags_pointer); 734 mdesc = setup_machine_fdt(__atags_pointer);
735 if (!mdesc) 735 if (!mdesc)
736 mdesc = setup_machine_tags(__atags_pointer, machine_arch_type); 736 mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
737 machine_desc = mdesc; 737 machine_desc = mdesc;
738 machine_name = mdesc->name; 738 machine_name = mdesc->name;
739 739