From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Oct 2013 08:34:41 +0000 (+1100)
Subject: powerpc: Add includes to fix powernv/rng.c build
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~19^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1400b4204ca334bb67be5b091b45214b57912b33;p=pandora-kernel.git

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 <sfr@canb.auug.org.au>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Reading git-diff-tree failed