aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/setup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1bdd0adbb7dd..8fc2c8fcbdc6 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -902,6 +902,12 @@ void __init setup_arch(char **cmdline_p)
902 machine_desc = mdesc; 902 machine_desc = mdesc;
903 machine_name = mdesc->name; 903 machine_name = mdesc->name;
904 904
905#ifdef CONFIG_ZONE_DMA
906 if (mdesc->dma_zone_size) {
907 extern unsigned long arm_dma_zone_size;
908 arm_dma_zone_size = mdesc->dma_zone_size;
909 }
910#endif
905 if (mdesc->soft_reboot) 911 if (mdesc->soft_reboot)
906 reboot_setup("s"); 912 reboot_setup("s");
907 913
@@ -932,12 +938,6 @@ void __init setup_arch(char **cmdline_p)
932 938
933 tcm_init(); 939 tcm_init();
934 940
935#ifdef CONFIG_ZONE_DMA
936 if (mdesc->dma_zone_size) {
937 extern unsigned long arm_dma_zone_size;
938 arm_dma_zone_size = mdesc->dma_zone_size;
939 }
940#endif
941#ifdef CONFIG_MULTI_IRQ_HANDLER 941#ifdef CONFIG_MULTI_IRQ_HANDLER
942 handle_arch_irq = mdesc->handle_irq; 942 handle_arch_irq = mdesc->handle_irq;
943#endif 943#endif