diff options
author | Tony Lindgren | 2011-07-11 08:18:06 +0200 |
---|---|---|
committer | Tony Lindgren | 2011-07-11 08:18:06 +0200 |
commit | e1d62c9bd8779a8e4a335803f0fced9e614d0a9f (patch) | |
tree | 1f20939eca46cd6bb169f0174439035fcf324cd2 /arch/arm/plat-omap/include/plat/omap-pm.h | |
parent | Convert OMAPs 32kHz clocksource implementation to use the generic MMIO (diff) | |
parent | Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine... (diff) | |
download | kernel-qcow2-linux-e1d62c9bd8779a8e4a335803f0fced9e614d0a9f.tar.gz kernel-qcow2-linux-e1d62c9bd8779a8e4a335803f0fced9e614d0a9f.tar.xz kernel-qcow2-linux-e1d62c9bd8779a8e4a335803f0fced9e614d0a9f.zip |
Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup-part-3
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap-pm.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap-pm.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-pm.h b/arch/arm/plat-omap/include/plat/omap-pm.h index c0a752053039..0840df813f4f 100644 --- a/arch/arm/plat-omap/include/plat/omap-pm.h +++ b/arch/arm/plat-omap/include/plat/omap-pm.h @@ -40,11 +40,7 @@ * framework starts. The "_if_" is to avoid name collisions with the * PM idle-loop code. */ -#ifdef CONFIG_OMAP_PM_NONE -#define omap_pm_if_early_init() 0 -#else int __init omap_pm_if_early_init(void); -#endif /** * omap_pm_if_init - OMAP PM init code called after clock fw init @@ -52,11 +48,7 @@ int __init omap_pm_if_early_init(void); * The main initialization code. OPP tables are passed in here. The * "_if_" is to avoid name collisions with the PM idle-loop code. */ -#ifdef CONFIG_OMAP_PM_NONE -#define omap_pm_if_init() 0 -#else int __init omap_pm_if_init(void); -#endif /** * omap_pm_if_exit - OMAP PM exit code |