diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 05:13:46 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 05:13:46 +0400 |
| commit | a95aa84f5ef257ee1e5c408dc0734a8bb121ed99 (patch) | |
| tree | b1d5dd2ec4cd614f88290b8d483c763011e9b2cb /arch/arm/Kconfig | |
| parent | ca43af527e3892802853a87375de1fb0d704d3bb (diff) | |
| parent | 4b1082ca8cd3bec99fc0ce020a8ba1fa3aa8e22a (diff) | |
| download | linux-a95aa84f5ef257ee1e5c408dc0734a8bb121ed99.tar.xz | |
Merge tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes-non-critical
* tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
ARM: tegra: fix debugfs entry for Tegra30
ARM: tegra: fix return value for debugfs init
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 2f88d8d97701..bb9f20accbb8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2313,7 +2313,7 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE - depends on !ARCH_S5PC100 && !ARCH_TEGRA + depends on !ARCH_S5PC100 depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK def_bool y |