← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/powerpc/kernel/of_platform.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/kernel/of_platform.c
36
36
 * lacking some bits needed here.
37
37
 */
38
38
 
39
 
static int __devinit of_pci_phb_probe(struct platform_device *dev,
40
 
                                      const struct of_device_id *match)
 
39
static int __devinit of_pci_phb_probe(struct platform_device *dev)
41
40
{
42
41
        struct pci_controller *phb;
43
42
 
74
73
#endif /* CONFIG_EEH */
75
74
 
76
75
        /* Scan the bus */
77
 
        pcibios_scan_phb(phb, dev->dev.of_node);
 
76
        pcibios_scan_phb(phb);
78
77
        if (phb->bus == NULL)
79
78
                return -ENXIO;
80
79
 
104
103
        {}
105
104
};
106
105
 
107
 
static struct of_platform_driver of_pci_phb_driver = {
 
106
static struct platform_driver of_pci_phb_driver = {
108
107
        .probe = of_pci_phb_probe,
109
108
        .driver = {
110
109
                .name = "of-pci",
115
114
 
116
115
static __init int of_pci_phb_init(void)
117
116
{
118
 
        return of_register_platform_driver(&of_pci_phb_driver);
 
117
        return platform_driver_register(&of_pci_phb_driver);
119
118
}
120
119
 
121
120
device_initcall(of_pci_phb_init);