[ARM] Fix up initcall ordering

ARM machine support gets initialised too late in the initialisation
order and can cause some things to unexpectedly fail.  Fix the
ordering of these initcalls by placing them in the core and arch
initcall sections.

arch/arm/mach-integrator/cpu.c

@@ -181,4 +181,4 @@ static int __init integrator_cpu_init(void)
 	return 0;
 }
 
-__initcall(integrator_cpu_init);
+core_initcall(integrator_cpu_init);

arch/arm/mach-pxa/dma.c

@@ -124,7 +124,7 @@ static int __init pxa_dma_init (void)
 	return ret;
 }
 
-__initcall(pxa_dma_init);
+arch_initcall(pxa_dma_init);
 
 EXPORT_SYMBOL(pxa_request_dma);
 EXPORT_SYMBOL(pxa_free_dma);

arch/arm/mach-sa1100/adsbitsy.c

@@ -69,7 +69,7 @@ static int __init adsbitsy_init(void)
 	return 0;
 }
 
-__initcall(adsbitsy_init);
+arch_initcall(adsbitsy_init);
 
 static void __init adsbitsy_init_irq(void)
 {

arch/arm/mach-sa1100/assabet.c

@@ -126,7 +126,7 @@ static int __init assabet_init(void)
 	return 0;
 }
 
-__initcall(assabet_init);
+arch_initcall(assabet_init);
 
 
 /*

arch/arm/mach-sa1100/badge4.c

@@ -109,7 +109,7 @@ static int __init badge4_init(void)
 	return 0;
 }
 
-__initcall(badge4_init);
+arch_initcall(badge4_init);
 
 
 static unsigned badge4_5V_bitmap = 0;

arch/arm/mach-sa1100/cpu-sa1100.c

@@ -254,4 +254,4 @@ static int __init sa1100_dram_init(void)
 	return ret;
 }
 
-__initcall(sa1100_dram_init);
+core_initcall(sa1100_dram_init);

arch/arm/mach-sa1100/cpu-sa1110.c

@@ -327,4 +327,4 @@ static int __init sa1110_clk_init(void)
 	return 0;
 }
 
-__initcall(sa1110_clk_init);
+core_initcall(sa1110_clk_init);

arch/arm/mach-sa1100/flexanet.c

@@ -143,14 +143,6 @@ static int flexanet_serial_init(void)
 }
 
 
-static int __init flexanet_init(void)
-{
-	return 0;
-}
-
-__initcall(flexanet_init);
-
-
 static struct map_desc flexanet_io_desc[] __initdata = {
  /* virtual     physical    length      type */
   { 0xf0000000, 0x10000000, 0x00001000, MT_DEVICE }, /* Board Control Register */

arch/arm/mach-sa1100/freebird.c

@@ -48,7 +48,7 @@ static int __init freebird_init(void)
 	return 0;
 }
 
-__initcall(freebird_init);
+arch_initcall(freebird_init);
 
 static struct map_desc freebird_io_desc[] __initdata = {
  /* virtual     physical    length      type */

arch/arm/mach-sa1100/generic.c

@@ -8,11 +8,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Since this file should be linked before any other machine specific file,
- * the __initcall() here will be executed first.  This serves as default
- * initialization stuff for SA1100 machines which can be overriden later if
- * need be.
  */
 #include <linux/config.h>
 #include <linux/module.h>
@@ -117,7 +112,7 @@ static int __init sa1100_init(void)
 	return 0;
 }
 
-__initcall(sa1100_init);
+core_initcall(sa1100_init);
 
 void (*sa1100fb_backlight_power)(int on);
 void (*sa1100fb_lcd_power)(int on);

arch/arm/mach-sa1100/graphicsmaster.c

@@ -59,7 +59,7 @@ static int __init graphicsmaster_init(void)
 	return 0;
 }
 
-__initcall(graphicsmaster_init);
+arch_initcall(graphicsmaster_init);
 
 /*
  * Handlers for GraphicsMaster's external IRQ logic

arch/arm/mach-sa1100/huw_webpanel.c

@@ -52,7 +52,7 @@ static int __init init_huw_cs3(void)
 	return 0;
 }
 
-__initcall(init_huw_cs3);
+arch_initcall(init_huw_cs3);
 
 
 /**

arch/arm/mach-sa1100/jornada720.c

@@ -53,7 +53,7 @@ static int __init jornada720_init(void)
 	return 0;
 }
 
-__initcall(jornada720_init);
+arch_initcall(jornada720_init);
 
 static struct map_desc jornada720_io_desc[] __initdata = {
  /* virtual     physical    length      type */

arch/arm/mach-sa1100/leds.c

@@ -44,4 +44,4 @@ sa1100_leds_init(void)
 	return 0;
 }
 
-__initcall(sa1100_leds_init);
+core_initcall(sa1100_leds_init);

arch/arm/mach-sa1100/neponset.c

@@ -216,7 +216,7 @@ static int __init neponset_init(void)
 	return sa1111_init(&neponset_device, 0x40000000, IRQ_NEPONSET_SA1111);
 }
 
-__initcall(neponset_init);
+arch_initcall(neponset_init);
 
 static struct map_desc neponset_io_desc[] __initdata = {
  /* virtual     physical    length type */

arch/arm/mach-sa1100/omnimeter.c

@@ -39,7 +39,7 @@ static int __init omnimeter_init(void)
 	return 0;
 }
 
-__initcall(omnimeter_init);
+arch_initcall(omnimeter_init);
 
 static struct map_desc omnimeter_io_desc[] __initdata = {
  /* virtual     physical    length      type */

arch/arm/mach-sa1100/pfs168.c

@@ -39,7 +39,7 @@ static int __init pfs168_init(void)
 	return sa1111_init(NULL, 0x40000000, IRQ_GPIO25);
 }
 
-__initcall(pfs168_init);
+arch_initcall(pfs168_init);
 
 
 static void __init pfs168_init_irq(void)

arch/arm/mach-sa1100/pm.c

@@ -225,7 +225,7 @@ static int __init pm_init(void)
 	return 0;
 }
 
-__initcall(pm_init);
+fs_initcall(pm_init);
 
 #endif
 

arch/arm/mach-sa1100/simpad.c

@@ -131,7 +131,7 @@ static int __init cs3_init(void)
 	return 0;
 }
  
-__initcall(cs3_init);
+arch_initcall(cs3_init);
 
 #endif // CONFIG_PROC_FS
 

arch/arm/mach-sa1100/system3.c

@@ -429,7 +429,7 @@ static int __init system3_init(void)
 /**********************************************************************
  *  kernel magic macros
  */
-__initcall(system3_init);
+arch_initcall(system3_init);
 
 MACHINE_START(PT_SYSTEM3, "PT System 3")
 	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)

arch/arm/mach-sa1100/xp860.c

@@ -54,7 +54,7 @@ static int __init xp860_init(void)
 	return 0;
 }
 
-__initcall(xp860_init);
+arch_initcall(xp860_init);
 
 static struct map_desc xp860_io_desc[] __initdata = {
  /* virtual     physical    length      type */

arch/arm/mach-sa1100/yopy.c

@@ -65,7 +65,7 @@ static int __init yopy_hw_init(void)
 	return 0;
 }
 
-__initcall(yopy_hw_init);
+arch_initcall(yopy_hw_init);
 
 
 static struct map_desc yopy_io_desc[] __initdata = {

arch/arm/mm/alignment.c

@@ -611,4 +611,4 @@ static int __init alignment_init(void)
 	return 0;
 }
 
-__initcall(alignment_init);
+fs_initcall(alignment_init);

arch/arm/mm/minicache.c

@@ -65,4 +65,4 @@ static int __init minicache_init(void)
 	return 0;
 }
 
-__initcall(minicache_init);
+core_initcall(minicache_init);