diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 11:47:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 11:47:45 -0700 |
| commit | 340fcb5cb4c91e58a5102beb0b86b9c416b8c956 (patch) | |
| tree | d0e41752e473069f4ec9a065cd1f060c4e91266b /arch/arm/plat-samsung/include/plat | |
| parent | 37746c9a2dd28d52790dd84267b848c087a63b2e (diff) | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
This merges in the revert of multiplatform support for exynos.
Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.
* samsung/exynos-multiplatform:
Revert "ARM: exynos: enable multiplatform support"
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 266a4e3e245..f6fcadeee96 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h @@ -166,7 +166,6 @@ extern void s3c_pm_check_store(void); */ extern void s3c_pm_configure_extint(void); -#ifdef CONFIG_PLAT_SAMSUNG_SINGLE /** * samsung_pm_restore_gpios() - restore the state of the gpios after sleep. * @@ -182,10 +181,6 @@ extern void samsung_pm_restore_gpios(void); * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios(). */ extern void samsung_pm_save_gpios(void); -#else -#define samsung_pm_restore_gpios() do { } while(0) -#define samsung_pm_save_gpios() do { } while(0) -#endif extern void s3c_pm_save_core(void); extern void s3c_pm_restore_core(void); |