UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Olof Johansson 2012-03-10 08:56:58 -08:00
parent d9a5f4dd43 4647ca5761
commit 74c46469a5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/hsmmc.c
View File

@ -465,7 +465,7 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c)
#define MAX_OMAP_MMC_HWMOD_NAME_LEN 16 #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) int ctrl_nr)
{ {
struct omap_hwmod *oh; struct omap_hwmod *oh;

1
arch/arm/mach-omap2/powerdomain44xx.c
View File

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

1
arch/arm/mach-omap2/vc.c
View File

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