aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/pci.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-20 06:57:05 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-20 06:57:05 -0400
commit399fe2bdd315c3a678b59b72659c4ed1ce0e1a24 (patch)
tree7eadfcfc06b88b7386c94a92bd0a7a9dde08d9de /arch/ppc/kernel/pci.c
parentff065ddd96c233d27322de493fa023357939c888 (diff)
ppc: rename pci_assign_all_busses to pci_assign_all_buses
... for consistency with ppc64 and to make merging easier. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/pci.c')
-rw-r--r--arch/ppc/kernel/pci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 163276be7cc5..ad4ef2aaa6ab 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -54,7 +54,7 @@ static u8* pci_to_OF_bus_map;
54/* By default, we don't re-assign bus numbers. We do this only on 54/* By default, we don't re-assign bus numbers. We do this only on
55 * some pmacs 55 * some pmacs
56 */ 56 */
57int pci_assign_all_busses; 57int pci_assign_all_buses;
58 58
59struct pci_controller* hose_head; 59struct pci_controller* hose_head;
60struct pci_controller** hose_tail = &hose_head; 60struct pci_controller** hose_tail = &hose_head;
@@ -827,7 +827,7 @@ EXPORT_SYMBOL(pci_device_to_OF_node);
827 * PCI bus numbers have not yet been assigned, and you need to 827 * PCI bus numbers have not yet been assigned, and you need to
828 * issue PCI config cycles to an OF device. 828 * issue PCI config cycles to an OF device.
829 * It could also be used to "fix" RTAS config cycles if you want 829 * It could also be used to "fix" RTAS config cycles if you want
830 * to set pci_assign_all_busses to 1 and still use RTAS for PCI 830 * to set pci_assign_all_buses to 1 and still use RTAS for PCI
831 * config cycles. 831 * config cycles.
832 */ 832 */
833struct pci_controller* 833struct pci_controller*
@@ -1270,12 +1270,12 @@ pcibios_init(void)
1270 1270
1271 /* Scan all of the recorded PCI controllers. */ 1271 /* Scan all of the recorded PCI controllers. */
1272 for (next_busno = 0, hose = hose_head; hose; hose = hose->next) { 1272 for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
1273 if (pci_assign_all_busses) 1273 if (pci_assign_all_buses)
1274 hose->first_busno = next_busno; 1274 hose->first_busno = next_busno;
1275 hose->last_busno = 0xff; 1275 hose->last_busno = 0xff;
1276 bus = pci_scan_bus(hose->first_busno, hose->ops, hose); 1276 bus = pci_scan_bus(hose->first_busno, hose->ops, hose);
1277 hose->last_busno = bus->subordinate; 1277 hose->last_busno = bus->subordinate;
1278 if (pci_assign_all_busses || next_busno <= hose->last_busno) 1278 if (pci_assign_all_buses || next_busno <= hose->last_busno)
1279 next_busno = hose->last_busno + pcibios_assign_bus_offset; 1279 next_busno = hose->last_busno + pcibios_assign_bus_offset;
1280 } 1280 }
1281 pci_bus_count = next_busno; 1281 pci_bus_count = next_busno;
@@ -1284,7 +1284,7 @@ pcibios_init(void)
1284 * numbers vs. kernel bus numbers since we may have to 1284 * numbers vs. kernel bus numbers since we may have to
1285 * remap them. 1285 * remap them.
1286 */ 1286 */
1287 if (pci_assign_all_busses && have_of) 1287 if (pci_assign_all_buses && have_of)
1288 pcibios_make_OF_bus_map(); 1288 pcibios_make_OF_bus_map();
1289 1289
1290 /* Do machine dependent PCI interrupt routing */ 1290 /* Do machine dependent PCI interrupt routing */