diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-09 23:26:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 23:26:15 -0700 |
| commit | bdbaaf1ac756116a0f6ed116931934e7a6f35160 (patch) | |
| tree | a23cd113270f9013dfeffad1dfa17012bbf63d68 /arch/arm/Kconfig | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 3d5e8af45a3d52ff9fd30035ffbc4887e04f4d73 (diff) | |
Merge branch 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes
By Stephen Warren
via Stephen Warren
* 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
ARM: tegra: add pll_x freq table entry for 750MHz
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 36586dba6fa..d7d7cdf955e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2281,7 +2281,7 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE - depends on !ARCH_S5PC100 + depends on !ARCH_S5PC100 && !ARCH_TEGRA depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE def_bool y |