Merge branch 'fixes-non-critical-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

* 'fixes-non-critical-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h
  ARM: OMAP2+: Fix section warnings for hsmmc_init_one

arch/arm/mach-omap2/hsmmc.c

@@ -465,7 +465,7 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
 
 #define MAX_OMAP_MMC_HWMOD_NAME_LEN		16
 
-static void omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo,
+static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo,
 					int ctrl_nr)
 {
 	struct omap_hwmod *oh;

arch/arm/mach-omap2/powerdomain44xx.c

@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
+#include <linux/bug.h>
 
 #include "powerdomain.h"
 #include <plat/prcm.h>

arch/arm/mach-omap2/vc.c

@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/bug.h>
 
 #include <plat/cpu.h>