Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71842a74 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.5/initcall' into omap-for-v4.5/soc-v2

parents b0340850 8dd5ea72

arch/arm/mach-omap2/omap2-restart.c

+1 −1
Original line number Diff line number Diff line
@@ -62,4 +62,4 @@ static int __init omap2xxx_common_look_up_clks_for_reset(void) 


	return 0;

}

omap_core_initcall(omap2xxx_common_look_up_clks_for_reset);
 
omap_postcore_initcall(omap2xxx_common_look_up_clks_for_reset);

arch/arm/mach-omap2/omap_device.c

+1 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int __init omap_device_init(void) 
	bus_register_notifier(&platform_bus_type, &platform_nb);

	return 0;

}

omap_core_initcall(omap_device_init);

omap_postcore_initcall(omap_device_init);



/**

 * omap_device_late_idle - idle devices without drivers

arch/arm/mach-omap2/omap_hwmod.c

+1 −1
Original line number Diff line number Diff line
@@ -3307,7 +3307,7 @@ static int __init omap_hwmod_setup_all(void) 


	return 0;

}

omap_core_initcall(omap_hwmod_setup_all);

omap_postcore_initcall(omap_hwmod_setup_all);



/**

 * omap_hwmod_enable - enable an omap_hwmod

arch/arm/mach-omap2/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int __init omap_serial_early_init(void) 


	return 0;

}

omap_core_initcall(omap_serial_early_init);

omap_postcore_initcall(omap_serial_early_init);



/**

 * omap_serial_init_port() - initialize single serial port