aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/mb93090-mb00/pci-frv.h1
-rw-r--r--arch/frv/mb93090-mb00/pci-vdk.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index 089eeba4f3bc..76c4e73d643d 100644
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -31,7 +31,6 @@ void pcibios_resource_survey(void);
31/* pci-vdk.c */ 31/* pci-vdk.c */
32 32
33extern int __nongpreldata pcibios_last_bus; 33extern int __nongpreldata pcibios_last_bus;
34extern struct pci_bus *__nongpreldata pci_root_bus;
35extern struct pci_ops *__nongpreldata pci_root_ops; 34extern struct pci_ops *__nongpreldata pci_root_ops;
36 35
37/* pci-irq.c */ 36/* pci-irq.c */
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index d186b254ce99..0aa35f0eb0db 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -26,7 +26,6 @@
26unsigned int __nongpreldata pci_probe = 1; 26unsigned int __nongpreldata pci_probe = 1;
27 27
28int __nongpreldata pcibios_last_bus = -1; 28int __nongpreldata pcibios_last_bus = -1;
29struct pci_bus *__nongpreldata pci_root_bus;
30struct pci_ops *__nongpreldata pci_root_ops; 29struct pci_ops *__nongpreldata pci_root_ops;
31 30
32/* 31/*
@@ -416,8 +415,7 @@ int __init pcibios_init(void)
416 printk("PCI: Probing PCI hardware\n"); 415 printk("PCI: Probing PCI hardware\n");
417 pci_add_resource(&resources, &pci_ioport_resource); 416 pci_add_resource(&resources, &pci_ioport_resource);
418 pci_add_resource(&resources, &pci_iomem_resource); 417 pci_add_resource(&resources, &pci_iomem_resource);
419 pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, 418 pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);
420 &resources);
421 419
422 pcibios_irq_init(); 420 pcibios_irq_init();
423 pcibios_fixup_peer_bridges(); 421 pcibios_fixup_peer_bridges();