diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
| commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
| tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/arm/mach-omap2/pm.h | |
| parent | e76a0136a3cf1859fbc07f122e42293d22229558 (diff) | |
| parent | ce3f7cb96e67d6518c7fc7b361a76409c3817d64 (diff) | |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index f7b3baf76678..21201cd4117b 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
| @@ -11,9 +11,6 @@ | |||
| 11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H | 11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H |
| 12 | #define __ARCH_ARM_MACH_OMAP2_PM_H | 12 | #define __ARCH_ARM_MACH_OMAP2_PM_H |
| 13 | 13 | ||
| 14 | extern int omap2_pm_init(void); | ||
| 15 | extern int omap3_pm_init(void); | ||
| 16 | |||
| 17 | #ifdef CONFIG_PM_DEBUG | 14 | #ifdef CONFIG_PM_DEBUG |
| 18 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); | 15 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); |
| 19 | extern int omap2_pm_debug; | 16 | extern int omap2_pm_debug; |