diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-26 14:32:02 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-26 14:35:51 -0400 |
commit | 4923ee444a39c8b75027ed01a7812e940194dbec (patch) | |
tree | 660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/plat-samsung/include | |
parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) |
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616.
Turns out that multiplatform breaks some uses cases, such as when you
have an existing defconfig, since it adds the new EXYNOS_SINGLE config
option as a dependecy. As a result, nearly all exynos config options
will be disabled by default.
Reverting instead of rebasing since this branch is pulled in as a
dependency elsewhere.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung/include')
-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 266a4e3e2458..f6fcadeee969 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); | |||
166 | */ | 166 | */ |
167 | extern void s3c_pm_configure_extint(void); | 167 | extern void s3c_pm_configure_extint(void); |
168 | 168 | ||
169 | #ifdef CONFIG_PLAT_SAMSUNG_SINGLE | ||
170 | /** | 169 | /** |
171 | * samsung_pm_restore_gpios() - restore the state of the gpios after sleep. | 170 | * samsung_pm_restore_gpios() - restore the state of the gpios after sleep. |
172 | * | 171 | * |
@@ -182,10 +181,6 @@ extern void samsung_pm_restore_gpios(void); | |||
182 | * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios(). | 181 | * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios(). |
183 | */ | 182 | */ |
184 | extern void samsung_pm_save_gpios(void); | 183 | extern void samsung_pm_save_gpios(void); |
185 | #else | ||
186 | #define samsung_pm_restore_gpios() do { } while(0) | ||
187 | #define samsung_pm_save_gpios() do { } while(0) | ||
188 | #endif | ||
189 | 184 | ||
190 | extern void s3c_pm_save_core(void); | 185 | extern void s3c_pm_save_core(void); |
191 | extern void s3c_pm_restore_core(void); | 186 | extern void s3c_pm_restore_core(void); |