diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-28 19:34:41 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 15:59:04 +1100 |
| commit | 1400b4204ca334bb67be5b091b45214b57912b33 (patch) | |
| tree | 3d7e78cb384d59ce63beb5e434552935a91922c7 /arch/powerpc/platforms | |
| parent | 2f29e3a561017b95f5c3e40b7d66ec8bbd632d2d (diff) | |
| download | blackbird-op-linux-1400b4204ca334bb67be5b091b45214b57912b33.tar.gz blackbird-op-linux-1400b4204ca334bb67be5b091b45214b57912b33.zip | |
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/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/rng.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 <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> |
