commit a2b7ba025f94499a4e9b59cd34c8d6380f309a06
author Tony Lindgren <tony@atomide.com> Mon Oct 12 16:35:21 2015 -0700
committer Tony Lindgren <tony@atomide.com> Mon Oct 12 16:35:21 2015 -0700
tree 814e3b1b8157ba200fa448ceb4f3c4fbe2885da3
parent d8e1f5ed11a39a68da00f05000466c4f6db4456e
parent 7ef71b70e18a82bb363905f72672317d0e1e8810

Merge branch 'omap-for-v4.4/fixes' into for-next

arch/arm/mach-omap2/pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 87b98bf9..2dbd378 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -301,11 +301,11 @@
 	if (omap_irq_pending())
 		return;
 
-	trace_cpu_idle(1, smp_processor_id());
+	trace_cpu_idle_rcuidle(1, smp_processor_id());
 
 	omap_sram_idle();
 
-	trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
+	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
 }
 
 #ifdef CONFIG_SUSPEND

drivers/bus/omap-ocp2scp.c

diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
index 9f18569..bf500e0 100644
--- a/drivers/bus/omap-ocp2scp.c
+++ b/drivers/bus/omap-ocp2scp.c
@@ -117,7 +117,7 @@
 
 module_platform_driver(omap_ocp2scp_driver);
 
-MODULE_ALIAS("platform: omap-ocp2scp");
+MODULE_ALIAS("platform:omap-ocp2scp");
 MODULE_AUTHOR("Texas Instruments Inc.");
 MODULE_DESCRIPTION("OMAP OCP2SCP driver");
 MODULE_LICENSE("GPL v2");