On 10/28/2013 03:38 AM, Stephen Rothwell wrote:

Hi Rob,

After merging the dt-rh tree, today's linux-next build (powerpc 
ppc64_defconfig) failed like this:

arch/powerpc/platforms/powernv/rng.c: In function
'rng_init_per_cpu': arch/powerpc/platforms/powernv/rng.c:64:2:
error: implicit declaration of function 'of_get_ibm_chip_id'
[-Werror=implicit-function-declaration] chip_id =
of_get_ibm_chip_id(dn); ^ arch/powerpc/platforms/powernv/rng.c: In
function 'rng_create': arch/powerpc/platforms/powernv/rng.c:85:2:
error: implicit declaration of function 'of_iomap'
[-Werror=implicit-function-declaration] rng->regs= of_iomap(dn, 0);
  ^
arch/powerpc/platforms/powernv/rng.c:85:12: error: assignment makes pointer from integer without a cast [-Werror]
  rng->regs = of_iomap(dn, 0);
            ^

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):

Applying to the powerpc tree now seems like the better path.

From: Stephen Rothwell <redacted>
Date: Mon, 28 Oct 2013 19:34:41 +1100
Subject: [PATCH] powerpc: add include of prom.h to fix powernv/rng.c build

Signed-off-by: Stephen Rothwell <redacted>

Acked-by: Rob Herring <redacted>

Rob