diff options
author | Govindraj.R <govindraj.raja@ti.com> | 2012-03-29 12:30:28 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:05:02 -0400 |
commit | 335aece5c502672fd0eb26ede5427ab14f4f7948 (patch) | |
tree | 84004d6c4450809d7f88be35355345060e17d09e /arch | |
parent | 0195c00244dc2e9f522475868fa278c473ba7339 (diff) |
ARM: OMAP: pm: fix compilation break
Fix the compilation break observed on latest mainline caused
by 9f97da78 (Disintegrate asm/system.h for ARM):
arch/arm/mach-omap1/pm.c: In function 'omap_pm_prepare':
arch/arm/mach-omap1/pm.c:587: error: implicit declaration of function 'disable_hlt'
arch/arm/mach-omap1/pm.c: In function 'omap_pm_finish':
arch/arm/mach-omap1/pm.c:624: error: implicit declaration of function 'enable_hlt'
arch/arm/mach-omap1/pm.c: In function 'omap_pm_init':
arch/arm/mach-omap1/pm.c:681: error: 'arm_pm_idle' undeclared (first use in this function)
...
arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Kevin Hilman <khilman@ti.com>
[tony@atomide.com: updated to fix omap1 too]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/pm.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 306beaca14c5..f66c32912b22 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/io.h> | 44 | #include <linux/io.h> |
45 | #include <linux/atomic.h> | 45 | #include <linux/atomic.h> |
46 | 46 | ||
47 | #include <asm/system_misc.h> | ||
47 | #include <asm/irq.h> | 48 | #include <asm/irq.h> |
48 | #include <asm/mach/time.h> | 49 | #include <asm/mach/time.h> |
49 | #include <asm/mach/irq.h> | 50 | #include <asm/mach/irq.h> |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index a7bdec69a2b3..d0c1c9695996 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include <linux/suspend.h> | 18 | #include <linux/suspend.h> |
19 | 19 | ||
20 | #include <asm/system_misc.h> | ||
21 | |||
20 | #include <plat/omap-pm.h> | 22 | #include <plat/omap-pm.h> |
21 | #include <plat/omap_device.h> | 23 | #include <plat/omap_device.h> |
22 | #include "common.h" | 24 | #include "common.h" |