diff --git a/[refs] b/[refs] index a412a5a0eef3..4938f8771ea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d5fda6656fae8004deb81e91bbd144c8743e500 +refs/heads/master: 3e1d9874b44212628b65ec4455d32cb4880b553f diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 93d595a7477a..efe06e004714 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -2009,6 +2009,7 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE + depends on !ARCH_S5P64X0 && !ARCH_S5P6442 def_bool y endmenu