Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits) [POWERPC] Abolish powerpc_flash_init() [POWERPC] Early serial debug support for PPC44x [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc [POWERPC] Add device tree for Ebony [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now [POWERPC] MPIC U3/U4 MSI backend [POWERPC] MPIC MSI allocator [POWERPC] Enable MSI mappings for MPIC [POWERPC] Tell Phyp we support MSI [POWERPC] RTAS MSI implementation [POWERPC] PowerPC MSI infrastructure [POWERPC] Rip out the existing powerpc msi stubs [POWERPC] Remove use of 4level-fixup.h for ppc32 [POWERPC] Add powerpc PCI-E reset API implementation [POWERPC] Holly bootwrapper [POWERPC] Holly DTS [POWERPC] Holly defconfig [POWERPC] Add support for 750CL Holly board [POWERPC] Generalize tsi108 PCI setup [POWERPC] Generalize tsi108 PHY types ... Fixed conflict in include/asm-powerpc/kdebug.h manually Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@ -169,10 +169,10 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
|
||||
{
|
||||
const int *indexes, *names, *types, *domains;
|
||||
|
||||
indexes = get_property(dn, "ibm,drc-indexes", NULL);
|
||||
names = get_property(dn, "ibm,drc-names", NULL);
|
||||
types = get_property(dn, "ibm,drc-types", NULL);
|
||||
domains = get_property(dn, "ibm,drc-power-domains", NULL);
|
||||
indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
|
||||
names = of_get_property(dn, "ibm,drc-names", NULL);
|
||||
types = of_get_property(dn, "ibm,drc-types", NULL);
|
||||
domains = of_get_property(dn, "ibm,drc-power-domains", NULL);
|
||||
|
||||
if (!indexes || !names || !types || !domains) {
|
||||
/* Slot does not have dynamically-removable children */
|
||||
@ -205,7 +205,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
|
||||
char *name_tmp, *type_tmp;
|
||||
int i, rc;
|
||||
|
||||
my_index = get_property(dn, "ibm,my-drc-index", NULL);
|
||||
my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
|
||||
if (!my_index) {
|
||||
/* Node isn't DLPAR/hotplug capable */
|
||||
return -EINVAL;
|
||||
|
Reference in New Issue
Block a user