powerpc: Add includes to fix powernv/rng.c build

Caused by commit a4da0d5 ("powerpc: Implement arch_get_random_long/int() for powernv") from the powerpc tree interacting with commit b5b4bb3 ("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 <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
wentasah · Oct 30, 2013 · 1400b42 · 1400b42
1 parent 2f29e3a
commit 1400b42
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c
@@ -11,10 +11,13 @@
 
 #include <linux/kernel.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
+#include <linux/smp.h>
 #include <asm/archrandom.h>
 #include <asm/io.h>
+#include <asm/prom.h>
 #include <asm/machdep.h>