Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/Kconfig between commit 4a1b573346ee ("ARM: 7758/1:
introduce config HAS_BANDGAP") from Linus' tree and commit 59d92875a6d9
("ARM: OMAP: build mach-omap code only if needed") from the arm-soc tree.I fixed it up (the latter moved the "config ARCH_OMAP2PLUS" and included the "select ARCH_HAS_BANDGAP" despite there being no ARCH_HAS_BANDGAP config in the arm-soc tree :-() and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected]
pgpG8Vjyb4Ex3.pgp
Description: PGP signature
