| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20120327114545.031deecd5fb48267b56b9b2c@canb.auug.org.au>
Date: Tue, 27 Mar 2012 11:45:45 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Vinod Koul <vinod.koul@...el.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Javier Martin <javier.martin@...ta-silicon.com>,
Shawn Guo <shawn.guo@...aro.org>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 3c77c29c49c6 ("ASoC: imx: move
audmux driver into sound/soc/imx") from Linus' tree and commit
6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c")
from the slave-dma tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/mach-imx/Kconfig
index 3919fba,3da1421..0000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -46,7 -30,7 +42,6 @@@ config SOC_IMX2
bool
select MACH_MX21
select CPU_ARM926T
- select IMX_HAVE_DMA_V1
- select ARCH_MXC_AUDMUX_V1
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@@ -61,7 -46,7 +56,6 @@@ config SOC_IMX2
bool
select MACH_MX27
select CPU_ARM926T
- select IMX_HAVE_DMA_V1
- select ARCH_MXC_AUDMUX_V1
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists