]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Add includes to fix powernv/rng.c build
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Oct 2013 08:34:41 +0000 (19:34 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 30 Oct 2013 04:59:04 +0000 (15:59 +1100)
commitf22426f3b16dd609992f13ce184f62f8a86ec682
tree3d7e78cb384d59ce63beb5e434552935a91922c7
parente93d59140fb5fc0610a918c5a1653dfcb5011b21
powerpc: Add includes to fix powernv/rng.c build

Caused by commit f017f5f493de ("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>
arch/powerpc/platforms/powernv/rng.c