iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
411cabf79e
linux/arch/powerpc/platforms
History
Stephen Rothwell 1400b4204c powerpc: Add includes to fix powernv/rng.c build 
Caused by commit a4da0d50b2 ("powerpc: Implement
arch_get_random_long/int() for powernv") from the powerpc tree
interacting with commit b5b4bb3f6a ("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>
2013-10-30 15:59:04 +11:00
..
8xx powerpc/8xx/tqm8xx: Fix incorrect placement of __initdata tag 2013-10-11 16:49:00 +11:00
40x Removal of GENERIC_GPIO for v3.10 2013-05-09 09:59:16 -07:00
44x i2c: move OF helpers into the core 2013-08-23 10:22:20 +02:00
52xx powerpc: 52xx: provide a default in mpc52xx_irqhost_map() 2013-08-13 00:16:04 +02:00
82xx powerpc/82xx: fix checkpatch warnings for km82xx.c 2013-02-13 07:49:04 -06:00
83xx arch/powerpc/platforms/83xx: Remove obsolete cleanup for clientdata 2013-10-28 21:11:23 -05:00
85xx powerpc/p1010rdb: add P1010RDB-PB platform support 2013-10-28 21:11:23 -05:00
86xx powerpc: remove redundant GENERIC_GPIO selection 2013-03-20 22:48:15 +09:00
512x powerpc/mpc512x: add MPC5125 reset module support for system restart 2013-06-24 21:36:49 +02:00
amigaone pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
cell xfs: update for v3.12-rc1 2013-09-09 11:19:09 -07:00
chrp mv643xx_eth: convert to use the Marvell Orion MDIO driver 2013-03-22 10:25:15 -04:00
embedded6xx powerpc/6xx: add missing iounmap() on error in hlwd_pic_init() 2013-10-28 21:11:22 -05:00
maple POWERPC: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
pasemi cpufreq: powerpc: move cpufreq driver to drivers/cpufreq 2013-06-07 13:44:39 +02:00
powermac irqdomain refactoring for v3.11 2013-07-06 12:37:04 -07:00
powernv powerpc: Add includes to fix powernv/rng.c build 2013-10-30 15:59:04 +11:00
ps3 PTR_RET is now PTR_ERR_OR_ZERO(): Replace most. 2013-07-15 11:25:01 +09:30
pseries powerpc/pseries: Implement arch_get_random_long() based on H_RANDOM 2013-10-11 16:50:21 +11:00
wsp powerpc/scom: Change scom_read() and scom_write() to return errors 2013-10-11 16:53:34 +11:00
fsl_uli1575.c POWERPC: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
Kconfig powerpc: Better split CONFIG_PPC_INDIRECT_PIO and CONFIG_PPC_INDIRECT_MMIO 2013-08-14 14:57:50 +10:00
Kconfig.cputype powerpc/booke64: Use appropriate -mcpu 2013-08-20 19:55:36 -05:00
Makefile powerpc: Remove the main legacy iSerie platform code 2012-03-09 10:35:11 +11:00