From: Stephen Rothwell Date: Mon, 28 Oct 2013 08:34:41 +0000 (+1100) Subject: powerpc: Add includes to fix powernv/rng.c build X-Git-Tag: next-20131105~96^2~27 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=1400b4204ca334bb67be5b091b45214b57912b33 powerpc: Add includes to fix powernv/rng.c build Caused by commit a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv") from the powerpc tree interacting with commit b5b4bb3f6a11 ("of: only include prom.h on sparc") from the dt-rh tree. I added this merge fix patch (which will need to be sent to Linus when these two trees get merged, or could be applied now to the powerpc tree): [ Also add linux/smp.h to get cpu_to_chip_id -- BenH ] Signed-off-by: Stephen Rothwell Acked-by: Rob Herring Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c index 02db7d73cf8b..8844628915dc 100644 --- a/arch/powerpc/platforms/powernv/rng.c +++ b/arch/powerpc/platforms/powernv/rng.c @@ -11,10 +11,13 @@ #include #include +#include #include #include +#include #include #include +#include #include