diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-10 11:56:58 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-10 11:56:58 -0500 |
| commit | 74c46469a5f70a29ac961cfaa90a0422f1d09230 (patch) | |
| tree | e8f5131335e5743c8a463540155ad73e9784f2af /arch/arm/mach-omap2/powerdomain44xx.c | |
| parent | d9a5f4dd437ceb007e1f118e90ba5587a5e04d20 (diff) | |
| parent | 4647ca5761f5534470e98d06494403a2fd0d7b32 (diff) | |
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
Diffstat (limited to 'arch/arm/mach-omap2/powerdomain44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain44xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/powerdomain44xx.c b/arch/arm/mach-omap2/powerdomain44xx.c index a7880af4b3d9..601325b852a4 100644 --- a/arch/arm/mach-omap2/powerdomain44xx.c +++ b/arch/arm/mach-omap2/powerdomain44xx.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/bug.h> | ||
| 18 | 19 | ||
| 19 | #include "powerdomain.h" | 20 | #include "powerdomain.h" |
| 20 | #include <plat/prcm.h> | 21 | #include <plat/prcm.h> |