lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the arm tree
Hi Arnd,

On Thu, 13 Oct 2011 11:11:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/Kconfig between commit d0ee9f404f42 ("ARM: limit CONFIG_HAVE_IDE
> to platforms that do") from the arm tree and commit 06a4eada6a73 ("ARM:
> switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H") from the arm-soc
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

This also affected arch/arm/plat-omap/Kconfig

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/arm/plat-omap/Kconfig
index 5b605a9,6d49d2f1d..0000000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -14,7 -14,7 +14,8 @@@ config ARCH_OMAP
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
+ select HAVE_IDE
+ select HAVE_MACH_MEMORY_H
help
"Systems based on omap7xx, omap15xx or omap16xx"

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-10-13 02:19    [W:0.033 / U:0.536 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site