diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
| commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
| tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/plat-omap/include/plat/omap-pm.h | |
| parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
| parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
| download | blackbird-obmc-linux-c2fda22207e2977d0b80eac58a9004b6f8beed6d.tar.gz blackbird-obmc-linux-c2fda22207e2977d0b80eac58a9004b6f8beed6d.zip | |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
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 |
