diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:08:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:08:48 -0700 |
| commit | 32836e082b25f17e7b09f11335b34b039c7568d2 (patch) | |
| tree | 6f25d4aa5b713a41844416a0dd16517c1f5d14ce /arch/arm/Kconfig | |
| parent | 036a98263a30930a329e7bb184d5e77f27358e40 (diff) | |
| parent | 3e1d9874b44212628b65ec4455d32cb4880b553f (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: Suspend: Fix dependency of ARCH_SUSPEND_POSSIBLE
ARM: SAMSUNG: Fix CPU idmask
ARM: EXYNOS4: Fix addruart macro
ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKC210
ARM: EXYNOS4: Fix smsc9215 irq polarity on SMDKV310
ARM: EXYNOS4: Fix build warning on regarding SATA_AHCI_PLATFORM
ARM: S5PV210: Remove duplicated inclusion
ARM: S5PV210: Fix security engine interrupt names
ARM: S5P64X0: Fix iodesc array size for S5P6450
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 93d595a7477a..efe06e004714 100644 --- a/arch/arm/Kconfig +++ b/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 |