* [PATCH -next] arm/mm: fix broken Kconfig
@ 2011-07-24 21:15 Arnaud Lacombe
2011-07-25 12:52 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Arnaud Lacombe @ 2011-07-24 21:15 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnaud Lacombe, Arnd Bergmann
Missing backslash lead to:
arch/arm/mm/Kconfig:834: invalid option
arch/arm/mm/Kconfig:835: syntax error
arch/arm/mm/Kconfig:838: unknown option "ARCH_PRIMA2"
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
arch/arm/mm/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index d490c4a..2df5504 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -834,7 +834,7 @@ config CACHE_L2X0
depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
- ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE ||
+ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
default y
select OUTER_CACHE
--
1.7.6.153.g78432
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] arm/mm: fix broken Kconfig
2011-07-24 21:15 [PATCH -next] arm/mm: fix broken Kconfig Arnaud Lacombe
@ 2011-07-25 12:52 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2011-07-25 12:52 UTC (permalink / raw)
To: Arnaud Lacombe; +Cc: linux-kernel
On Sunday 24 July 2011, Arnaud Lacombe wrote:
> Missing backslash lead to:
>
> arch/arm/mm/Kconfig:834: invalid option
> arch/arm/mm/Kconfig:835: syntax error
> arch/arm/mm/Kconfig:838: unknown option "ARCH_PRIMA2"
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Thanks.
The problem was a mismerge in the tree that I have corrected this
weekend, it should be fixed in today's -next.
Arnd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-25 12:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-24 21:15 [PATCH -next] arm/mm: fix broken Kconfig Arnaud Lacombe
2011-07-25 12:52 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.