diff options
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 4a06d9c34986..9c974227155e 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/ide.h> | ||
28 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
29 | 28 | ||
30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
@@ -177,7 +176,7 @@ void __init iSeries_pci_final_fixup(void) | |||
177 | struct pci_dn *pdn = PCI_DN(node); | 176 | struct pci_dn *pdn = PCI_DN(node); |
178 | const u32 *agent; | 177 | const u32 *agent; |
179 | 178 | ||
180 | agent = get_property(node, "linux,agent-id", NULL); | 179 | agent = of_get_property(node, "linux,agent-id", NULL); |
181 | if ((pdn != NULL) && (agent != NULL)) { | 180 | if ((pdn != NULL) && (agent != NULL)) { |
182 | u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, | 181 | u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, |
183 | pdn->bussubno); | 182 | pdn->bussubno); |
@@ -755,7 +754,7 @@ void __init iSeries_pcibios_init(void) | |||
755 | if ((node->type == NULL) || (strcmp(node->type, "pci") != 0)) | 754 | if ((node->type == NULL) || (strcmp(node->type, "pci") != 0)) |
756 | continue; | 755 | continue; |
757 | 756 | ||
758 | busp = get_property(node, "bus-range", NULL); | 757 | busp = of_get_property(node, "bus-range", NULL); |
759 | if (busp == NULL) | 758 | if (busp == NULL) |
760 | continue; | 759 | continue; |
761 | bus = *busp; | 760 | bus = *busp; |