aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:50:19 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:50:19 -0400
commitdf6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch)
tree0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /drivers/pci
parent74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff)
parent197686dfe0038fd190326d118b743ff65ad20c0e (diff)
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/rpaphp_core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 6e3118733508..458c08ef2654 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -169,10 +169,10 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
169{ 169{
170 const int *indexes, *names, *types, *domains; 170 const int *indexes, *names, *types, *domains;
171 171
172 indexes = get_property(dn, "ibm,drc-indexes", NULL); 172 indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
173 names = get_property(dn, "ibm,drc-names", NULL); 173 names = of_get_property(dn, "ibm,drc-names", NULL);
174 types = get_property(dn, "ibm,drc-types", NULL); 174 types = of_get_property(dn, "ibm,drc-types", NULL);
175 domains = get_property(dn, "ibm,drc-power-domains", NULL); 175 domains = of_get_property(dn, "ibm,drc-power-domains", NULL);
176 176
177 if (!indexes || !names || !types || !domains) { 177 if (!indexes || !names || !types || !domains) {
178 /* Slot does not have dynamically-removable children */ 178 /* Slot does not have dynamically-removable children */
@@ -205,7 +205,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
205 char *name_tmp, *type_tmp; 205 char *name_tmp, *type_tmp;
206 int i, rc; 206 int i, rc;
207 207
208 my_index = get_property(dn, "ibm,my-drc-index", NULL); 208 my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
209 if (!my_index) { 209 if (!my_index) {
210 /* Node isn't DLPAR/hotplug capable */ 210 /* Node isn't DLPAR/hotplug capable */
211 return -EINVAL; 211 return -EINVAL;