linux-next: build failure after merge of the final tree (arm-soctree related)

From: Stephen Rothwell
Date: Fri Jul 22 2011 - 02:42:18 EST

Hi all,

After merging the final tree, today's linux-next build (all arm builds)
failed like this:

arch/arm/mm/Kconfig:835: syntax error
arch/arm/mm/Kconfig:834: invalid option
arch/arm/mm/Kconfig:838: unknown option "ARCH_PRIMA2"

Caused by commit 69ca71d177d1 ("Merge branch 'next/soc' of git
+ssh:// into
for-next-3") from the arm-soc tree.

This commit mismerged the config CACHE_L2X0 entry (forgot the \ on the end
of one of the lines).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature