summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-10-28 19:34:41 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-10-30 15:59:04 +1100
commit1400b4204ca334bb67be5b091b45214b57912b33 (patch)
tree3d7e78cb384d59ce63beb5e434552935a91922c7 /arch/powerpc/boot
parent2f29e3a561017b95f5c3e40b7d66ec8bbd632d2d (diff)
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>
Diffstat (limited to 'arch/powerpc/boot')
0 files changed, 0 insertions, 0 deletions