linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell
Date: Mon Oct 10 2011 - 22:08:13 EST
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/Kconfig between commit 15e0d9e37c7f ("ARM: pm: let
platforms select cpu_suspend support") from the arm tree and commits
bf856fbb5e10 ("ARM: EXYNOS4: Use generic DMA PL330 driver"), 0da3beadcbed
("ARM: S5P: Make the common S5P PM code conditionally compile") and
e2e13621b267 ("ARM: S5P: Make the sleep code common for S5P series SoCs")
from the s5p tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-exynos4/Kconfig
index a652735,dd660eb..0000000
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,9 +11,10 @@@ if ARCH_EXYNOS
config CPU_EXYNOS4210
bool
- select S3C_PL330_DMA
+ select SAMSUNG_DMADEV
+ select S5P_PM if PM
+ select S5P_SLEEP if PM
+ select ARM_CPU_SUSPEND if PM
help
Enable EXYNOS4210 CPU support
Attachment:
pgp00000.pgp
Description: PGP signature