Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/plat-omap/devices.c between commit
2817142f31bfbf26c216bf4f9192540c81b2d071 ("[WATCHDOG] omap_wdt.c: sync
linux-omap changes") from Linus' tree and commit
cc26b3b01bc96a8b8c36671b0dc4898b2a152ea8 ("ARM: OMAP3: Add minimal
omap3430 support") from the arm tree.
The former removed code that the latter modified. I fixed it up
by just removing the section of code as the former patch seems to take
account of what the latter is trying to do (but it may not be correct).
You can fix it by merging Linus' tree and doing this or a similar (maybe
correct) fixup.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5fGqHJh0ya.pgp
Description: PGP signature
